platform/upstream/opencv.git
11 years agoRemoved Note, added other fix (libs to lib)
StevenPuttemans [Wed, 17 Jul 2013 13:02:55 +0000 (15:02 +0200)]
Removed Note, added other fix (libs to lib)

11 years agoChanged tutorial for installing openCV under VS2010 like bug 3157 suggested
StevenPuttemans [Wed, 17 Jul 2013 11:38:45 +0000 (13:38 +0200)]
Changed tutorial for installing openCV under VS2010 like bug 3157 suggested

11 years agoMerge pull request #1049 from pengx17:2.4_superres_ocl
Roman Donchenko [Mon, 15 Jul 2013 07:43:08 +0000 (11:43 +0400)]
Merge pull request #1049 from pengx17:2.4_superres_ocl

11 years agoMerge pull request #1109 from nikman-ru:cap_reuse_24x
Roman Donchenko [Fri, 12 Jul 2013 07:38:59 +0000 (11:38 +0400)]
Merge pull request #1109 from nikman-ru:cap_reuse_24x

11 years agoMerge pull request #1111 from nikman-ru:fix_yamldoc
Roman Donchenko [Fri, 12 Jul 2013 07:38:14 +0000 (11:38 +0400)]
Merge pull request #1111 from nikman-ru:fix_yamldoc

11 years agoFixed "FileStorage (minor) error in doc (Feature #3151)"
Nikita Manovich [Thu, 11 Jul 2013 12:06:25 +0000 (16:06 +0400)]
Fixed "FileStorage (minor) error in doc (Feature #3151)"

It was just a typo in the documentation.

11 years agoFixed VideoCapture::open() does not release previous capture sources (Bug #3150).
Nikita Manovich [Wed, 10 Jul 2013 13:43:47 +0000 (17:43 +0400)]
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.

11 years agoMerge pull request #1106 from pengx17:2.4_gftt_rename
Andrey Pavlenko [Thu, 11 Jul 2013 07:41:37 +0000 (11:41 +0400)]
Merge pull request #1106 from pengx17:2.4_gftt_rename

11 years agoMerge pull request #1102 from SpecLad:xls-updates
Andrey Pavlenko [Thu, 11 Jul 2013 07:36:47 +0000 (11:36 +0400)]
Merge pull request #1102 from SpecLad:xls-updates

11 years agoMerge pull request #1077 from bitwangyaoyao:2.4_kmeans
Roman Donchenko [Wed, 10 Jul 2013 14:32:13 +0000 (18:32 +0400)]
Merge pull request #1077 from bitwangyaoyao:2.4_kmeans

11 years agoMerge pull request #1088 from apacha:brisk_noDescriptors_fix
Roman Donchenko [Wed, 10 Jul 2013 14:18:31 +0000 (18:18 +0400)]
Merge pull request #1088 from apacha:brisk_noDescriptors_fix

11 years agoMerge pull request #1080 from hhofbaue:matchTemplate_bugfix
Roman Donchenko [Wed, 10 Jul 2013 14:17:06 +0000 (18:17 +0400)]
Merge pull request #1080 from hhofbaue:matchTemplate_bugfix

11 years agoMerge pull request #1103 from apavlenko:ver_2.4.6.1
Roman Donchenko [Wed, 10 Jul 2013 11:48:59 +0000 (15:48 +0400)]
Merge pull request #1103 from apavlenko:ver_2.4.6.1

11 years agosetting version to 2.4.6.1 (hot-fix release for Linux camera support)
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)

11 years agoxls-report.py: Added an option to show per-pixel times
Roman Donchenko [Wed, 10 Jul 2013 10:50:51 +0000 (14:50 +0400)]
xls-report.py: Added an option to show per-pixel times

11 years agoMade the crude ability less crude.
Roman Donchenko [Tue, 9 Jul 2013 14:57:22 +0000 (18:57 +0400)]
Made the crude ability less crude.

11 years agoAdded to the test log parser a crude ability to detect non-implemented tests.
Roman Donchenko [Fri, 5 Jul 2013 15:05:42 +0000 (19:05 +0400)]
Added to the test log parser a crude ability to detect non-implemented tests.

11 years agoxls-report.py: removed image size and type from the list of other parameters.
Roman Donchenko [Fri, 5 Jul 2013 14:41:03 +0000 (18:41 +0400)]
xls-report.py: removed image size and type from the list of other parameters.

Also, shrunk the corresponding column and the test name column.

11 years agoxls-report.py: add ability to specify arbitrary sheet properties
Roman Donchenko [Fri, 5 Jul 2013 12:10:28 +0000 (16:10 +0400)]
xls-report.py: add ability to specify arbitrary sheet properties

11 years agoFix ocl gftt file name typo.
peng xiao [Wed, 10 Jul 2013 06:51:40 +0000 (14:51 +0800)]
Fix ocl gftt file name typo.

11 years agoMerge pull request #1099 from asmorkalov:linux_vcap_fix
Roman Donchenko [Tue, 9 Jul 2013 13:13:05 +0000 (17:13 +0400)]
Merge pull request #1099 from asmorkalov:linux_vcap_fix

11 years agoV4L and V4L2 based Video capture bug fix (Bugfix #3144).
Alexander Smorkalov [Tue, 9 Jul 2013 12:07:55 +0000 (16:07 +0400)]
V4L and V4L2 based Video capture bug fix (Bugfix #3144).

11 years agoMerge pull request #1097 from apavlenko:ocl_tests_fixes
Roman Donchenko [Tue, 9 Jul 2013 10:00:38 +0000 (14:00 +0400)]
Merge pull request #1097 from apavlenko:ocl_tests_fixes

11 years agofixing working with test data and a small fix for init code
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!

11 years agoMerge pull request #1094 from asmorkalov:android_na_fix
Andrey Pavlenko [Mon, 8 Jul 2013 07:25:40 +0000 (11:25 +0400)]
Merge pull request #1094 from asmorkalov:android_na_fix

11 years agoVarious fixes in android sample NativeActivity.
Alexander Smorkalov [Fri, 5 Jul 2013 10:08:37 +0000 (14:08 +0400)]
Various fixes in android sample NativeActivity.

11 years agoMerge pull request #1073 from asmorkalov:android_cvjavaframe
Roman Donchenko [Fri, 5 Jul 2013 09:41:51 +0000 (13:41 +0400)]
Merge pull request #1073 from asmorkalov:android_cvjavaframe

11 years agoMerge pull request #1074 from devernay:2.4-cap_qt-multithread
Roman Donchenko [Fri, 5 Jul 2013 09:28:38 +0000 (13:28 +0400)]
Merge pull request #1074 from devernay:2.4-cap_qt-multithread

11 years agoMerge pull request #1092 from asmorkalov:manager_version_inc
Andrey Pavlenko [Fri, 5 Jul 2013 09:02:09 +0000 (13:02 +0400)]
Merge pull request #1092 from asmorkalov:manager_version_inc

11 years agoMerge pull request #1087 from znah:2.4
Roman Donchenko [Fri, 5 Jul 2013 08:07:44 +0000 (12:07 +0400)]
Merge pull request #1087 from znah:2.4

11 years agoOpenCV Manager version++.
Alexander Smorkalov [Fri, 5 Jul 2013 08:07:04 +0000 (12:07 +0400)]
OpenCV Manager version++.

11 years agoMerge pull request #1091 from SpecLad:xls-updates
Roman Donchenko [Fri, 5 Jul 2013 08:00:52 +0000 (12:00 +0400)]
Merge pull request #1091 from SpecLad:xls-updates

11 years agofix the function name
yao [Fri, 5 Jul 2013 00:59:21 +0000 (08:59 +0800)]
fix the function name

11 years agoxls-report.py: make behaviour more intelligent in case of repeated results
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

11 years agoxls-report.py: write tests in sorted order
Roman Donchenko [Thu, 4 Jul 2013 14:52:10 +0000 (18:52 +0400)]
xls-report.py: write tests in sorted order

11 years agoxls-report.py: made most columns a little wider
Roman Donchenko [Thu, 4 Jul 2013 14:44:56 +0000 (18:44 +0400)]
xls-report.py: made most columns a little wider

11 years agoxls-report.py: added an option to include data from unrecognized XMLs
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

11 years agoMerge pull request #1090 from asmorkalov:android_tbb_downgrade
Roman Donchenko [Thu, 4 Jul 2013 15:46:53 +0000 (19:46 +0400)]
Merge pull request #1090 from asmorkalov:android_tbb_downgrade

11 years agoBug #3124 libopencv_java.so v 2.4.6 hangs on some Android 4.0.3 devices fixed.
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.

11 years agoxls-report.py: don't eat all errors when reading sheet.conf
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

11 years agoline realign
Alexander Mordvintsev [Thu, 4 Jul 2013 13:43:38 +0000 (17:43 +0400)]
line realign

11 years agoMerge pull request #1085 from bitwangyaoyao:2.4_optBP
Roman Donchenko [Thu, 4 Jul 2013 13:24:19 +0000 (17:24 +0400)]
Merge pull request #1085 from bitwangyaoyao:2.4_optBP

11 years agoMerge pull request #1086 from melody-rain:2.4_fix_oclMat_constructor
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

11 years agoFix oclMat constructor when roi is provided.
Jin Ma [Thu, 4 Jul 2013 08:14:55 +0000 (16:14 +0800)]
Fix oclMat constructor when roi is provided.

11 years agooptimize stereoBP kernel
yao [Thu, 4 Jul 2013 06:46:38 +0000 (14:46 +0800)]
optimize stereoBP kernel

11 years agoFixed issue 3130 (http://code.opencv.org/issues/3130), where one argument of the...
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.

11 years agoremove the redundant function
yao [Thu, 4 Jul 2013 00:59:42 +0000 (08:59 +0800)]
remove the redundant function

11 years agoGFTT wrapped to python
Alexander Mordvintsev [Wed, 3 Jul 2013 18:26:18 +0000 (22:26 +0400)]
GFTT wrapped to python

11 years agoBugfix for an overlapping size of image and template for matchTemplate.
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.

11 years agoadd kmeans
yao [Wed, 3 Jul 2013 05:13:04 +0000 (13:13 +0800)]
add kmeans

11 years agoallow QtKit capture in secondary threads
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

11 years agoJavaCameraView delivers same frame twice (Bug #3123) fixed.
Alexander Smorkalov [Tue, 2 Jul 2013 08:58:59 +0000 (12:58 +0400)]
JavaCameraView delivers same frame twice (Bug #3123) fixed.

11 years agoMerge pull request #1051 from pengx17:2.4_fback_ocl
Roman Donchenko [Mon, 1 Jul 2013 09:45:42 +0000 (13:45 +0400)]
Merge pull request #1051 from pengx17:2.4_fback_ocl

11 years agoMerge pull request #1061 from bitwangyaoyao:2.4_fix2
Roman Donchenko [Mon, 1 Jul 2013 09:21:12 +0000 (13:21 +0400)]
Merge pull request #1061 from bitwangyaoyao:2.4_fix2

11 years agoMerge pull request #1060 from pengx17:2.4_setbinary_fix
Roman Donchenko [Mon, 1 Jul 2013 09:20:51 +0000 (13:20 +0400)]
Merge pull request #1060 from pengx17:2.4_setbinary_fix

11 years agoMerge pull request #1055 from pengx17:2.4_ocl_hang_workaround
Roman Donchenko [Mon, 1 Jul 2013 09:20:04 +0000 (13:20 +0400)]
Merge pull request #1055 from pengx17:2.4_ocl_hang_workaround

11 years agoMerge pull request #1069 from apavlenko:fix_bin_compat_checker
Andrey Pavlenko [Mon, 1 Jul 2013 08:10:57 +0000 (12:10 +0400)]
Merge pull request #1069 from apavlenko:fix_bin_compat_checker

11 years agoadding 'ios.h' to ignore list should work on non-Mac)
Andrey Pavlenko [Mon, 1 Jul 2013 06:03:08 +0000 (10:03 +0400)]
adding 'ios.h' to ignore list should work on non-Mac)

11 years agoMerge pull request #1067 from asmorkalov:android_service_readme
Roman Donchenko [Fri, 28 Jun 2013 15:47:30 +0000 (19:47 +0400)]
Merge pull request #1067 from asmorkalov:android_service_readme

11 years agoMerge pull request #1065 from apavlenko:fix_eclipse_warning
Roman Donchenko [Fri, 28 Jun 2013 15:32:44 +0000 (19:32 +0400)]
Merge pull request #1065 from apavlenko:fix_eclipse_warning

11 years agoMerge pull request #1064 from asmorkalov:winrt_sample_fix
Roman Donchenko [Fri, 28 Jun 2013 15:08:12 +0000 (19:08 +0400)]
Merge pull request #1064 from asmorkalov:winrt_sample_fix

11 years agoOpenCV Version++; Manager Version++
Alexander Smorkalov [Fri, 28 Jun 2013 14:25:53 +0000 (18:25 +0400)]
OpenCV Version++; Manager Version++

11 years agoremoving unused import
Andrey Pavlenko [Fri, 28 Jun 2013 13:28:57 +0000 (17:28 +0400)]
removing unused import

11 years agoPath to OpenCV dll libs fixes.
Alexander Smorkalov [Fri, 28 Jun 2013 12:48:27 +0000 (16:48 +0400)]
Path to OpenCV dll libs fixes.

11 years agoMerge pull request #1059 from dominikrose:dc1394_2-1394b
Roman Donchenko [Fri, 28 Jun 2013 10:47:45 +0000 (14:47 +0400)]
Merge pull request #1059 from dominikrose:dc1394_2-1394b

11 years agoMerge pull request #1063 from alekcac:conversion
Roman Donchenko [Fri, 28 Jun 2013 10:41:35 +0000 (14:41 +0400)]
Merge pull request #1063 from alekcac:conversion

11 years agoMerge pull request #1062 from kirill-kornyakov:fixes-for-documentation
Roman Donchenko [Fri, 28 Jun 2013 10:35:51 +0000 (14:35 +0400)]
Merge pull request #1062 from kirill-kornyakov:fixes-for-documentation

11 years agoMerge pull request #1018 from jet47:cuda-5.5-arm
Roman Donchenko [Fri, 28 Jun 2013 10:26:45 +0000 (14:26 +0400)]
Merge pull request #1018 from jet47:cuda-5.5-arm

11 years agostereoBM fix an error on Linux when running full performance test
yao [Fri, 28 Jun 2013 09:45:39 +0000 (17:45 +0800)]
stereoBM fix an error on Linux when running full performance test

11 years agoadded conversions between UIImage and cv::Mat
Alexander Shishkov [Fri, 28 Jun 2013 09:26:54 +0000 (13:26 +0400)]
added conversions between UIImage and cv::Mat

11 years agoRemoved references to opencv.itseez.com
Kirill Kornyakov [Fri, 28 Jun 2013 08:48:12 +0000 (12:48 +0400)]
Removed references to opencv.itseez.com

11 years agoRemoved all references to trunk
Kirill Kornyakov [Fri, 28 Jun 2013 08:38:44 +0000 (12:38 +0400)]
Removed all references to trunk

11 years agowarnings fix
yao [Fri, 28 Jun 2013 08:23:01 +0000 (16:23 +0800)]
warnings fix

11 years agoRemoved references to YG from samples
Kirill Kornyakov [Fri, 28 Jun 2013 08:21:52 +0000 (12:21 +0400)]
Removed references to YG from samples

11 years agoCompletely get rid of opencv_group
Kirill Kornyakov [Fri, 28 Jun 2013 08:15:14 +0000 (12:15 +0400)]
Completely get rid of opencv_group

11 years agoUpdated a couple of more links
Kirill Kornyakov [Fri, 28 Jun 2013 08:12:53 +0000 (12:12 +0400)]
Updated a couple of more links

11 years agoupdated email address
Kirill Kornyakov [Fri, 28 Jun 2013 07:53:39 +0000 (11:53 +0400)]
updated email address

11 years agoMentioned 2.4 and master branches
Kirill Kornyakov [Fri, 28 Jun 2013 07:51:40 +0000 (11:51 +0400)]
Mentioned 2.4 and master branches

11 years agoAdded link to contribution process, updated formatting
Kirill Kornyakov [Thu, 13 Jun 2013 12:48:17 +0000 (16:48 +0400)]
Added link to contribution process, updated formatting

11 years agochanged contacts in tutorual
Alexander Shishkov [Thu, 4 Apr 2013 21:31:30 +0000 (01:31 +0400)]
changed contacts in tutorual

11 years agoMerge pull request #1054 from asmorkalov:opencv_version
Roman Donchenko [Fri, 28 Jun 2013 07:29:54 +0000 (11:29 +0400)]
Merge pull request #1054 from asmorkalov:opencv_version

11 years agosome tweaks to samples
yao [Fri, 28 Jun 2013 07:08:39 +0000 (15:08 +0800)]
some tweaks to samples

11 years agomore fix to HOG
yao [Fri, 28 Jun 2013 05:38:58 +0000 (13:38 +0800)]
more fix to HOG

11 years agoformat the ocl's samples name
yao [Fri, 28 Jun 2013 03:44:43 +0000 (11:44 +0800)]
format the ocl's samples name

11 years agosome accuracy fix of HOG
yao [Fri, 28 Jun 2013 03:43:43 +0000 (11:43 +0800)]
some accuracy fix of HOG

11 years agoMove function definition from header to cpp.
peng xiao [Fri, 28 Jun 2013 02:52:39 +0000 (10:52 +0800)]
Move function definition from header to cpp.

11 years agoRenew function logic.
peng xiao [Fri, 28 Jun 2013 02:39:09 +0000 (10:39 +0800)]
Renew function logic.

11 years agoFix ocl::setBinaryDiskCache
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.

11 years agoMerge remote-tracking branch 'remotes/upstream/2.4' into dc1394_2-1394b
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

11 years agodc1394-2: support for operation mode 1394b added
Dominik Rose [Thu, 27 Jun 2013 13:05:32 +0000 (15:05 +0200)]
dc1394-2: support for operation mode 1394b added

11 years agoMerge pull request #1040 from asmorkalov:winrt
Roman Donchenko [Thu, 27 Jun 2013 12:59:25 +0000 (16:59 +0400)]
Merge pull request #1040 from asmorkalov:winrt

11 years agoMerge pull request #1056 from asmorkalov:android_old_remove
Roman Donchenko [Thu, 27 Jun 2013 12:29:56 +0000 (16:29 +0400)]
Merge pull request #1056 from asmorkalov:android_old_remove

11 years agoMerge pull request #1057 from SpecLad:gtest-param-filter
Roman Donchenko [Thu, 27 Jun 2013 11:50:31 +0000 (15:50 +0400)]
Merge pull request #1057 from SpecLad:gtest-param-filter

11 years agoTest fixes
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.

11 years agoTBB updated to version 4.1 update 4.
Alexander Smorkalov [Wed, 26 Jun 2013 09:31:47 +0000 (02:31 -0700)]
TBB updated to version 4.1 update 4.

11 years agoExtended Google Test to allow filtering by parameter value.
Roman Donchenko [Wed, 26 Jun 2013 14:34:36 +0000 (18:34 +0400)]
Extended Google Test to allow filtering by parameter value.

11 years agoMerge pull request #1050 from pengx17:2.4_clach_mod
Roman Donchenko [Thu, 27 Jun 2013 08:22:00 +0000 (12:22 +0400)]
Merge pull request #1050 from pengx17:2.4_clach_mod

11 years agoOpenCV Library and Manager version incremented.
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.

11 years agoOld android folder removed.
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!

11 years agoTemporarily disable command queue release as it causes program hang at exit
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