f9b594bf08
Changed first approach to a more general MS-specific approach.
...
Suggested by @SpecLad
2013-07-18 14:24:19 +02:00
1fc89bb2e0
Added the solution mentioned in patch #3125
2013-07-17 13:20:25 +02:00
886c009da6
Merge pull request #1049 from pengx17:2.4_superres_ocl
2013-07-15 11:43:09 +04:00
09ec483d02
Merge pull request #1109 from nikman-ru:cap_reuse_24x
2013-07-12 11:38:59 +04:00
18f1964f8a
Merge pull request #1111 from nikman-ru:fix_yamldoc
2013-07-12 11:38:14 +04:00
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
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
d1fe1a62c3
Merge pull request #1106 from pengx17:2.4_gftt_rename
2013-07-11 11:41:37 +04:00
07c2ae508e
Merge pull request #1102 from SpecLad:xls-updates
2013-07-11 11:36:47 +04:00
241e2d2360
Merge pull request #1077 from bitwangyaoyao:2.4_kmeans
2013-07-10 18:32:14 +04:00
894b30b34d
Merge pull request #1088 from apacha:brisk_noDescriptors_fix
2013-07-10 18:18:31 +04:00
f0c7cce87a
Merge pull request #1080 from hhofbaue:matchTemplate_bugfix
2013-07-10 18:17:06 +04:00
a0f6e1ba1d
Merge pull request #1103 from apavlenko:ver_2.4.6.1
2013-07-10 15:49:00 +04:00
2b2e02166e
setting version to 2.4.6.1 (hot-fix release for Linux camera support)
2013-07-10 15:12:39 +04:00
ea3239a00e
xls-report.py: Added an option to show per-pixel times
2013-07-10 14:58:51 +04:00
5b2dc26f2c
Made the crude ability less crude.
2013-07-10 14:58:51 +04:00
215b3e749f
Added to the test log parser a crude ability to detect non-implemented tests.
2013-07-10 14:58:51 +04:00
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
63d151a29c
xls-report.py: add ability to specify arbitrary sheet properties
2013-07-10 14:58:17 +04:00
5032240c9d
Fix ocl gftt file name typo.
2013-07-10 14:51:40 +08:00
2dedfd9762
Merge pull request #1099 from asmorkalov:linux_vcap_fix
2013-07-09 17:13:05 +04:00
f77d1f57ee
V4L and V4L2 based Video capture bug fix (Bugfix #3144 ).
2013-07-09 16:07:55 +04:00
b1f04c5388
Merge pull request #1097 from apavlenko:ocl_tests_fixes
2013-07-09 14:00:38 +04:00
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
1a2458885b
Merge pull request #1094 from asmorkalov:android_na_fix
2013-07-08 11:25:40 +04:00
69b308a368
Various fixes in android sample NativeActivity.
2013-07-05 14:08:37 +04:00
f5089100b9
Merge pull request #1073 from asmorkalov:android_cvjavaframe
2013-07-05 13:41:51 +04:00
c4e59866a2
Merge pull request #1074 from devernay:2.4-cap_qt-multithread
2013-07-05 13:28:38 +04:00
b6b1d5e75d
Merge pull request #1092 from asmorkalov:manager_version_inc
2013-07-05 13:02:10 +04:00
36a4d246f4
Merge pull request #1087 from znah:2.4
2013-07-05 12:07:45 +04:00
e905c81ccc
OpenCV Manager version++.
2013-07-05 12:07:04 +04:00
dbf02c71b6
Merge pull request #1091 from SpecLad:xls-updates
2013-07-05 12:00:52 +04:00
88ed74a7ec
fix the function name
2013-07-05 08:59:21 +08:00
2b44172026
xls-report.py: make behaviour more intelligent in case of repeated results
2013-07-04 20:01:27 +04:00
0732905cff
xls-report.py: write tests in sorted order
2013-07-04 20:01:27 +04:00
ea054e2888
xls-report.py: made most columns a little wider
2013-07-04 20:01:27 +04:00
4e939e2fce
xls-report.py: added an option to include data from unrecognized XMLs
2013-07-04 20:00:59 +04:00
ec1df9f54d
Merge pull request #1090 from asmorkalov:android_tbb_downgrade
2013-07-04 19:46:53 +04:00
c2e6668414
Bug #3124 libopencv_java.so v 2.4.6 hangs on some Android 4.0.3 devices fixed.
...
Downgrade TBB to 4.1u2 for all platforms, except WinRT.
2013-07-04 18:52:52 +04:00
83fd385bbd
xls-report.py: don't eat all errors when reading sheet.conf
2013-07-04 18:03:03 +04:00
3677a66403
line realign
2013-07-04 17:43:38 +04:00
a2d576c1bb
Merge pull request #1085 from bitwangyaoyao:2.4_optBP
2013-07-04 17:24:21 +04:00
4d569732b9
Merge pull request #1086 from melody-rain:2.4_fix_oclMat_constructor
2013-07-04 17:23:53 +04:00
97e620b8f3
Fix oclMat constructor when roi is provided.
2013-07-04 16:14:55 +08:00
f2333e90f6
optimize stereoBP kernel
2013-07-04 14:46:38 +08:00
eaa29110e1
Fixed issue 3130 ( http://code.opencv.org/issues/3130 ), where one argument of the BRISK-call was ignored. Previously it was not possible to use BRISK without creating descriptors.
...
Now it behaves like ORB (and how it is documented), and you can call BRISK to just generate feature points and no descriptors.
2013-07-04 16:36:29 +12:00
c23510785b
remove the redundant function
2013-07-04 08:59:42 +08:00
8045093cfb
GFTT wrapped to python
2013-07-03 22:26:18 +04:00
a26c4fa2a2
Bugfix for an overlapping size of image and template for matchTemplate.
...
Example: img of size 10x10 and templ of size 11x9.
In subsequent code this will results in either width or height of
corrSize to be zero (0).
Line 261 will call crossCorr which will then have a zero size of either
blocksize.width or blocksize.height resulting in a division by zero
crach in lines 137 or 138.
2013-07-03 14:58:40 +02:00
8d8dc29ced
add kmeans
2013-07-03 13:13:04 +08:00
StevenPuttemans
Roman Donchenko
Nikita Manovich
Andrey Pavlenko
peng xiao
Alexander Smorkalov
yao
Alexander Mordvintsev
Jin Ma
Alexander Pacha
Heinz Hofbauer