peng xiao
ff73557304
Fix compilation error on Mac
2013-07-16 08:48:09 +08:00
peng xiao
e5c396bb24
Add ocl::gftt performance test.
2013-07-15 16:27:27 +08:00
Roman Donchenko
886c009da6
Merge pull request #1049 from pengx17:2.4_superres_ocl
2013-07-15 11:43:09 +04:00
yao
cdd9234fae
fix hog mismatch on cpu ocl
2013-07-15 15:13:09 +08:00
Roman Donchenko
09ec483d02
Merge pull request #1109 from nikman-ru:cap_reuse_24x
2013-07-12 11:38:59 +04:00
Roman Donchenko
18f1964f8a
Merge pull request #1111 from nikman-ru:fix_yamldoc
2013-07-12 11:38:14 +04:00
Nikita Manovich
c55dc3e8ab
Fixed "FileStorage (minor) error in doc (Feature #3151 )"
...
It was just a typo in the documentation.
2013-07-11 16:06:25 +04:00
Roman Donchenko
0b4d0a8171
Sorted cvconfig.h.cmake in alphabetical order.
2013-07-11 16:01:46 +04:00
Nikita Manovich
05aeb70831
Fixed VideoCapture::open() does not release previous capture sources (Bug #3150 ).
...
VideoCapture didn't call release method and just ignored the new capture sources.
OpenCV documentation:
bool VideoCapture::open(const string& filename);
bool VideoCapture::open(int device);
The methods first call VideoCapture::release() to close the already opened file or camera.
2013-07-11 15:16:22 +04:00
Roman Donchenko
78cb920bc8
Removed useless VERSION macro (and CMake variable)
2013-07-11 14:30:46 +04:00
Roman Donchenko
06742247be
Removed unused PACKAGE_* macros.
2013-07-11 14:30:46 +04:00
Roman Donchenko
6f326220d3
Removed the HAVE_LRINT macro, which is never set.
2013-07-11 14:30:46 +04:00
Roman Donchenko
eb8d9730cb
Removed unused NEW_FFMPEG macro.
2013-07-11 12:55:34 +04:00
Roman Donchenko
e2ef2a5781
Refactored image format library finding logic.
...
Now the HAVE_* macros are set in cvconfig.h. Most of them already were there,
but were nonfunctional.
2013-07-11 12:40:16 +04:00
Andrey Pavlenko
d1fe1a62c3
Merge pull request #1106 from pengx17:2.4_gftt_rename
2013-07-11 11:41:37 +04:00
Andrey Pavlenko
07c2ae508e
Merge pull request #1102 from SpecLad:xls-updates
2013-07-11 11:36:47 +04:00
kdrobnyh
df4b67a749
Merge pull request #1 from Itseez/2.4
...
Add calculating integral image using IPP
2013-07-10 10:45:24 -07:00
Roman Donchenko
ca8b621b4f
Refactored detecting several Apple-related technologies.
...
Now the HAVE_* macros are set using cvconfig.h. Previously most
of them already were there, but were always undefined. One,
HAVE_COCOA, I had to add.
This also makes the CMake code more consistent; now, WITH_* variables
are always checked in cmake/*, while HAVE_* variables are checked in
modules/highgui/CMakeLists.txt.
2013-07-10 19:45:56 +04:00
Roman Donchenko
241e2d2360
Merge pull request #1077 from bitwangyaoyao:2.4_kmeans
2013-07-10 18:32:14 +04:00
Roman Donchenko
4f9554eead
Removed a few more unused configuration macros.
...
I've left HAVE_LIBPTHREAD as a CMake variable, since TBB's build depends on it.
Some macros in internal.hpp depended on HAVE_ALLOCA_H, but they were, in turn,
unused, so I've just deleted them all.
2013-07-10 18:29:11 +04:00
Roman Donchenko
2d9b3a8334
Deleted a bunch of unused configuration macros.
2013-07-10 18:29:10 +04:00
Roman Donchenko
894b30b34d
Merge pull request #1088 from apacha:brisk_noDescriptors_fix
2013-07-10 18:18:31 +04:00
Roman Donchenko
f0c7cce87a
Merge pull request #1080 from hhofbaue:matchTemplate_bugfix
2013-07-10 18:17:06 +04:00
Roman Donchenko
ac39bfb4cc
Remove HAVE_CVCONFIG_H - it's always defined.
2013-07-10 16:02:07 +04:00
Roman Donchenko
a0f6e1ba1d
Merge pull request #1103 from apavlenko:ver_2.4.6.1
2013-07-10 15:49:00 +04:00
Andrey Pavlenko
2b2e02166e
setting version to 2.4.6.1 (hot-fix release for Linux camera support)
2013-07-10 15:12:39 +04:00
Roman Donchenko
ea3239a00e
xls-report.py: Added an option to show per-pixel times
2013-07-10 14:58:51 +04:00
Roman Donchenko
5b2dc26f2c
Made the crude ability less crude.
2013-07-10 14:58:51 +04:00
Roman Donchenko
215b3e749f
Added to the test log parser a crude ability to detect non-implemented tests.
2013-07-10 14:58:51 +04:00
Roman Donchenko
1080c4295a
xls-report.py: removed image size and type from the list of other parameters.
...
Also, shrunk the corresponding column and the test name column.
2013-07-10 14:58:18 +04:00
Roman Donchenko
63d151a29c
xls-report.py: add ability to specify arbitrary sheet properties
2013-07-10 14:58:17 +04:00
kdrobnyh
f8eb806565
Add IPP support to integral function
2013-07-10 11:25:36 +04:00
peng xiao
5032240c9d
Fix ocl gftt file name typo.
2013-07-10 14:51:40 +08:00
Roman Donchenko
2dedfd9762
Merge pull request #1099 from asmorkalov:linux_vcap_fix
2013-07-09 17:13:05 +04:00
Alexander Smorkalov
f77d1f57ee
V4L and V4L2 based Video capture bug fix (Bugfix #3144 ).
2013-07-09 16:07:55 +04:00
Roman Donchenko
b1f04c5388
Merge pull request #1097 from apavlenko:ocl_tests_fixes
2013-07-09 14:00:38 +04:00
Andrey Pavlenko
fcb4c0e51c
fixing working with test data and a small fix for init code
...
- set init value for `numsdev` to prevent use of uninitialized value
- stop use of 'workdir' and files from samples
- forcing use of 'opencv_extra' instead
Note: set OPENCV_TEST_DATA_PATH to full path to 'opencv_extra/testdata' (gitolite@code.opencv.org:opencv_extra.git) before running the test!
2013-07-09 13:25:21 +04:00
Andrew Senin
aa2ca3aa8f
Improve FPS on black and white Ximea cameras
2013-07-09 00:33:39 +04:00
Andrey Pavlenko
1a2458885b
Merge pull request #1094 from asmorkalov:android_na_fix
2013-07-08 11:25:40 +04:00
Alexander Smorkalov
69b308a368
Various fixes in android sample NativeActivity.
2013-07-05 14:08:37 +04:00
Roman Donchenko
f5089100b9
Merge pull request #1073 from asmorkalov:android_cvjavaframe
2013-07-05 13:41:51 +04:00
Roman Donchenko
c4e59866a2
Merge pull request #1074 from devernay:2.4-cap_qt-multithread
2013-07-05 13:28:38 +04:00
Andrey Pavlenko
b6b1d5e75d
Merge pull request #1092 from asmorkalov:manager_version_inc
2013-07-05 13:02:10 +04:00
Roman Donchenko
36a4d246f4
Merge pull request #1087 from znah:2.4
2013-07-05 12:07:45 +04:00
Alexander Smorkalov
e905c81ccc
OpenCV Manager version++.
2013-07-05 12:07:04 +04:00
Roman Donchenko
dbf02c71b6
Merge pull request #1091 from SpecLad:xls-updates
2013-07-05 12:00:52 +04:00
yao
88ed74a7ec
fix the function name
2013-07-05 08:59:21 +08:00
Roman Donchenko
2b44172026
xls-report.py: make behaviour more intelligent in case of repeated results
2013-07-04 20:01:27 +04:00
Roman Donchenko
0732905cff
xls-report.py: write tests in sorted order
2013-07-04 20:01:27 +04:00
Roman Donchenko
ea054e2888
xls-report.py: made most columns a little wider
2013-07-04 20:01:27 +04:00