Roman Donchenko [Wed, 10 Jul 2013 14:18:31 +0000 (18:18 +0400)]
Merge pull request #1088 from apacha:brisk_noDescriptors_fix
Roman Donchenko [Wed, 10 Jul 2013 14:17:06 +0000 (18:17 +0400)]
Merge pull request #1080 from hhofbaue:matchTemplate_bugfix
Roman Donchenko [Wed, 10 Jul 2013 11:48:59 +0000 (15:48 +0400)]
Merge pull request #1103 from apavlenko:ver_2.4.6.1
Andrey Pavlenko [Wed, 10 Jul 2013 11:12:39 +0000 (15:12 +0400)]
setting version to 2.4.6.1 (hot-fix release for Linux camera support)
Roman Donchenko [Tue, 9 Jul 2013 13:13:05 +0000 (17:13 +0400)]
Merge pull request #1099 from asmorkalov:linux_vcap_fix
Alexander Smorkalov [Tue, 9 Jul 2013 12:07:55 +0000 (16:07 +0400)]
V4L and V4L2 based Video capture bug fix (Bugfix #3144).
Roman Donchenko [Tue, 9 Jul 2013 10:00:38 +0000 (14:00 +0400)]
Merge pull request #1097 from apavlenko:ocl_tests_fixes
Andrey Pavlenko [Mon, 8 Jul 2013 17:12:21 +0000 (21:12 +0400)]
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!
Andrey Pavlenko [Mon, 8 Jul 2013 07:25:40 +0000 (11:25 +0400)]
Merge pull request #1094 from asmorkalov:android_na_fix
Alexander Smorkalov [Fri, 5 Jul 2013 10:08:37 +0000 (14:08 +0400)]
Various fixes in android sample NativeActivity.
Roman Donchenko [Fri, 5 Jul 2013 09:41:51 +0000 (13:41 +0400)]
Merge pull request #1073 from asmorkalov:android_cvjavaframe
Roman Donchenko [Fri, 5 Jul 2013 09:28:38 +0000 (13:28 +0400)]
Merge pull request #1074 from devernay:2.4-cap_qt-multithread
Andrey Pavlenko [Fri, 5 Jul 2013 09:02:09 +0000 (13:02 +0400)]
Merge pull request #1092 from asmorkalov:manager_version_inc
Roman Donchenko [Fri, 5 Jul 2013 08:07:44 +0000 (12:07 +0400)]
Merge pull request #1087 from znah:2.4
Alexander Smorkalov [Fri, 5 Jul 2013 08:07:04 +0000 (12:07 +0400)]
OpenCV Manager version++.
Roman Donchenko [Fri, 5 Jul 2013 08:00:52 +0000 (12:00 +0400)]
Merge pull request #1091 from SpecLad:xls-updates
Roman Donchenko [Thu, 4 Jul 2013 15:59:26 +0000 (19:59 +0400)]
xls-report.py: make behaviour more intelligent in case of repeated results
Roman Donchenko [Thu, 4 Jul 2013 14:52:10 +0000 (18:52 +0400)]
xls-report.py: write tests in sorted order
Roman Donchenko [Thu, 4 Jul 2013 14:44:56 +0000 (18:44 +0400)]
xls-report.py: made most columns a little wider
Roman Donchenko [Thu, 4 Jul 2013 14:19:33 +0000 (18:19 +0400)]
xls-report.py: added an option to include data from unrecognized XMLs
Roman Donchenko [Thu, 4 Jul 2013 15:46:53 +0000 (19:46 +0400)]
Merge pull request #1090 from asmorkalov:android_tbb_downgrade
Alexander Smorkalov [Thu, 4 Jul 2013 14:51:17 +0000 (18:51 +0400)]
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.
Roman Donchenko [Thu, 4 Jul 2013 14:03:03 +0000 (18:03 +0400)]
xls-report.py: don't eat all errors when reading sheet.conf
Alexander Mordvintsev [Thu, 4 Jul 2013 13:43:38 +0000 (17:43 +0400)]
line realign
Roman Donchenko [Thu, 4 Jul 2013 13:24:19 +0000 (17:24 +0400)]
Merge pull request #1085 from bitwangyaoyao:2.4_optBP
Roman Donchenko [Thu, 4 Jul 2013 13:23:53 +0000 (17:23 +0400)]
Merge pull request #1086 from melody-rain:2.4_fix_oclMat_constructor
Jin Ma [Thu, 4 Jul 2013 08:14:55 +0000 (16:14 +0800)]
Fix oclMat constructor when roi is provided.
yao [Thu, 4 Jul 2013 06:46:38 +0000 (14:46 +0800)]
optimize stereoBP kernel
Alexander Pacha [Thu, 4 Jul 2013 04:36:29 +0000 (16:36 +1200)]
Fixed issue 3130 (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.
Alexander Mordvintsev [Wed, 3 Jul 2013 18:26:18 +0000 (22:26 +0400)]
GFTT wrapped to python
Heinz Hofbauer [Wed, 3 Jul 2013 12:58:40 +0000 (14:58 +0200)]
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.
Frédéric Devernay [Tue, 2 Jul 2013 16:08:12 +0000 (18:08 +0200)]
allow QtKit capture in secondary threads
[NSRunLoop currentRunLoop] is not the same as in the main thread.
see
https://developer.apple.com/library/mac/#documentation/Cocoa/Reference/F
oundation/Classes/nsrunloop_Class/Reference/Reference.html
"If no input sources or timers are attached to the run loop, this
method exits immediately"
The old code caused grabFrame() to return immediately if the capture
was not done in the main thread.
This code works correctly, even in secondary threads, provided that all
capture functions are called in the *same* thread
Alexander Smorkalov [Tue, 2 Jul 2013 08:58:59 +0000 (12:58 +0400)]
JavaCameraView delivers same frame twice (Bug #3123) fixed.
Roman Donchenko [Mon, 1 Jul 2013 09:45:42 +0000 (13:45 +0400)]
Merge pull request #1051 from pengx17:2.4_fback_ocl
Roman Donchenko [Mon, 1 Jul 2013 09:21:12 +0000 (13:21 +0400)]
Merge pull request #1061 from bitwangyaoyao:2.4_fix2
Roman Donchenko [Mon, 1 Jul 2013 09:20:51 +0000 (13:20 +0400)]
Merge pull request #1060 from pengx17:2.4_setbinary_fix
Roman Donchenko [Mon, 1 Jul 2013 09:20:04 +0000 (13:20 +0400)]
Merge pull request #1055 from pengx17:2.4_ocl_hang_workaround
Andrey Pavlenko [Mon, 1 Jul 2013 08:10:57 +0000 (12:10 +0400)]
Merge pull request #1069 from apavlenko:fix_bin_compat_checker
Andrey Pavlenko [Mon, 1 Jul 2013 06:03:08 +0000 (10:03 +0400)]
adding 'ios.h' to ignore list should work on non-Mac)
Roman Donchenko [Fri, 28 Jun 2013 15:47:30 +0000 (19:47 +0400)]
Merge pull request #1067 from asmorkalov:android_service_readme
Roman Donchenko [Fri, 28 Jun 2013 15:32:44 +0000 (19:32 +0400)]
Merge pull request #1065 from apavlenko:fix_eclipse_warning
Roman Donchenko [Fri, 28 Jun 2013 15:08:12 +0000 (19:08 +0400)]
Merge pull request #1064 from asmorkalov:winrt_sample_fix
Alexander Smorkalov [Fri, 28 Jun 2013 14:25:53 +0000 (18:25 +0400)]
OpenCV Version++; Manager Version++
Andrey Pavlenko [Fri, 28 Jun 2013 13:28:57 +0000 (17:28 +0400)]
removing unused import
Alexander Smorkalov [Fri, 28 Jun 2013 12:48:27 +0000 (16:48 +0400)]
Path to OpenCV dll libs fixes.
Roman Donchenko [Fri, 28 Jun 2013 10:47:45 +0000 (14:47 +0400)]
Merge pull request #1059 from dominikrose:dc1394_2-1394b
Roman Donchenko [Fri, 28 Jun 2013 10:41:35 +0000 (14:41 +0400)]
Merge pull request #1063 from alekcac:conversion
Roman Donchenko [Fri, 28 Jun 2013 10:35:51 +0000 (14:35 +0400)]
Merge pull request #1062 from kirill-kornyakov:fixes-for-documentation
Roman Donchenko [Fri, 28 Jun 2013 10:26:45 +0000 (14:26 +0400)]
Merge pull request #1018 from jet47:cuda-5.5-arm
yao [Fri, 28 Jun 2013 09:45:39 +0000 (17:45 +0800)]
stereoBM fix an error on Linux when running full performance test
Alexander Shishkov [Fri, 28 Jun 2013 09:26:54 +0000 (13:26 +0400)]
added conversions between UIImage and cv::Mat
Kirill Kornyakov [Fri, 28 Jun 2013 08:48:12 +0000 (12:48 +0400)]
Removed references to opencv.itseez.com
Kirill Kornyakov [Fri, 28 Jun 2013 08:38:44 +0000 (12:38 +0400)]
Removed all references to trunk
yao [Fri, 28 Jun 2013 08:23:01 +0000 (16:23 +0800)]
warnings fix
Kirill Kornyakov [Fri, 28 Jun 2013 08:21:52 +0000 (12:21 +0400)]
Removed references to YG from samples
Kirill Kornyakov [Fri, 28 Jun 2013 08:15:14 +0000 (12:15 +0400)]
Completely get rid of opencv_group
Kirill Kornyakov [Fri, 28 Jun 2013 08:12:53 +0000 (12:12 +0400)]
Updated a couple of more links
Kirill Kornyakov [Fri, 28 Jun 2013 07:53:39 +0000 (11:53 +0400)]
updated email address
Kirill Kornyakov [Fri, 28 Jun 2013 07:51:40 +0000 (11:51 +0400)]
Mentioned 2.4 and master branches
Kirill Kornyakov [Thu, 13 Jun 2013 12:48:17 +0000 (16:48 +0400)]
Added link to contribution process, updated formatting
Alexander Shishkov [Thu, 4 Apr 2013 21:31:30 +0000 (01:31 +0400)]
changed contacts in tutorual
Roman Donchenko [Fri, 28 Jun 2013 07:29:54 +0000 (11:29 +0400)]
Merge pull request #1054 from asmorkalov:opencv_version
yao [Fri, 28 Jun 2013 07:08:39 +0000 (15:08 +0800)]
some tweaks to samples
yao [Fri, 28 Jun 2013 05:38:58 +0000 (13:38 +0800)]
more fix to HOG
yao [Fri, 28 Jun 2013 03:44:43 +0000 (11:44 +0800)]
format the ocl's samples name
yao [Fri, 28 Jun 2013 03:43:43 +0000 (11:43 +0800)]
some accuracy fix of HOG
peng xiao [Fri, 28 Jun 2013 02:52:39 +0000 (10:52 +0800)]
Move function definition from header to cpp.
peng xiao [Fri, 28 Jun 2013 02:39:09 +0000 (10:39 +0800)]
Renew function logic.
peng xiao [Fri, 28 Jun 2013 02:12:18 +0000 (10:12 +0800)]
Fix ocl::setBinaryDiskCache
Previously the function requires Info::Impl implicitly. A call will create
new Context this function which is not intended.
The properties are now moved to global scope to fix this issue.
Dominik Rose [Thu, 27 Jun 2013 17:43:05 +0000 (19:43 +0200)]
Merge remote-tracking branch 'remotes/upstream/2.4' into dc1394_2-1394b
Dominik Rose [Thu, 27 Jun 2013 13:05:32 +0000 (15:05 +0200)]
dc1394-2: support for operation mode 1394b added
Roman Donchenko [Thu, 27 Jun 2013 12:59:25 +0000 (16:59 +0400)]
Merge pull request #1040 from asmorkalov:winrt
Roman Donchenko [Thu, 27 Jun 2013 12:29:56 +0000 (16:29 +0400)]
Merge pull request #1056 from asmorkalov:android_old_remove
Roman Donchenko [Thu, 27 Jun 2013 11:50:31 +0000 (15:50 +0400)]
Merge pull request #1057 from SpecLad:gtest-param-filter
Alexander Smorkalov [Thu, 27 Jun 2013 06:56:50 +0000 (23:56 -0700)]
Test fixes
Calib3d badarg tests fixed. Default exception handling enabled;
Highgui Video I/O tests fixed on ARM;
Code cleanup.
Alexander Smorkalov [Wed, 26 Jun 2013 09:31:47 +0000 (02:31 -0700)]
TBB updated to version 4.1 update 4.
Roman Donchenko [Wed, 26 Jun 2013 14:34:36 +0000 (18:34 +0400)]
Extended Google Test to allow filtering by parameter value.
Roman Donchenko [Thu, 27 Jun 2013 08:22:00 +0000 (12:22 +0400)]
Merge pull request #1050 from pengx17:2.4_clach_mod
Alexander Smorkalov [Wed, 26 Jun 2013 13:12:51 +0000 (17:12 +0400)]
OpenCV Library and Manager version incremented.
OpenCV Version 2.4.6;
OpenCV Manager Version 2.8;
Doc fixes.
Alexander Smorkalov [Thu, 27 Jun 2013 07:26:51 +0000 (11:26 +0400)]
Old android folder removed.
The changes must be applied after buildbot update only!
peng xiao [Thu, 27 Jun 2013 02:20:21 +0000 (10:20 +0800)]
Temporarily disable command queue release as it causes program hang at exit
peng xiao [Thu, 27 Jun 2013 02:06:37 +0000 (10:06 +0800)]
Remove empty cv::ocl::CLAHE class.
peng xiao [Thu, 27 Jun 2013 01:57:42 +0000 (09:57 +0800)]
Fix white-spacing
Roman Donchenko [Wed, 26 Jun 2013 13:00:14 +0000 (17:00 +0400)]
Merge pull request #1053 from snosov1:unreliable-results-fix
Roman Donchenko [Wed, 26 Jun 2013 12:55:06 +0000 (16:55 +0400)]
Merge pull request #1045 from bitwangyaoyao:2.4_fix
Roman Donchenko [Wed, 26 Jun 2013 12:53:50 +0000 (16:53 +0400)]
Merge pull request #1048 from SpecLad:xls-conf
Alexander Smorkalov [Mon, 24 Jun 2013 08:10:18 +0000 (01:10 -0700)]
Windows RT related code cleanup.
Windows RT sample cleanup.
Video I/O code cleanup.
Roman Donchenko [Wed, 26 Jun 2013 12:13:47 +0000 (16:13 +0400)]
Merge pull request #1052 from SpecLad:ocl-mingw-warnings
Sergei Nosov [Wed, 26 Jun 2013 11:07:39 +0000 (15:07 +0400)]
multiruns added to avoid the 'unreliable results' error
Roman Donchenko [Wed, 26 Jun 2013 10:59:00 +0000 (14:59 +0400)]
Fix miscellaneous warnings from compiling with MinGW.
Note that MinGW defines NOMINMAX by default.
peng xiao [Wed, 26 Jun 2013 09:24:09 +0000 (17:24 +0800)]
Fix build errors
yao [Wed, 26 Jun 2013 08:58:20 +0000 (16:58 +0800)]
fix pyrlk
peng xiao [Wed, 26 Jun 2013 08:35:19 +0000 (16:35 +0800)]
Add opencl implementation of Farnback optical flow.
peng xiao [Wed, 26 Jun 2013 02:50:51 +0000 (10:50 +0800)]
Let CLAHE_OCL reuse cv::CLAHE abstract class.
Alexander Smorkalov [Thu, 20 Jun 2013 07:46:56 +0000 (00:46 -0700)]
WinRT build fix for samples and static libs.
Alexander Smorkalov [Wed, 19 Jun 2013 10:57:26 +0000 (03:57 -0700)]
Windows RT sample improved.
Corrent histogram output on YUV image implemented;
Some code refactoring done.
Alexander Smorkalov [Fri, 14 Jun 2013 22:01:09 +0000 (15:01 -0700)]
Transform selection implemented in sample GUI.
Gistogram output does not work propertly due color conversion problems.
Alexander Smorkalov [Mon, 10 Jun 2013 18:48:53 +0000 (11:48 -0700)]
Several transforms added to sample IMFTransform.
Alexander Smorkalov [Mon, 24 Jun 2013 09:32:57 +0000 (02:32 -0700)]
Windows RT sample updated.
Unused scenarious removed.
Grey scale convertion replaced with cv::Canny call.
Alexander Smorkalov [Thu, 6 Jun 2013 08:34:57 +0000 (01:34 -0700)]
Base camera access sample for Windows RT added.
Microsoft Media Foundation Camera Sample for Windows RT added.