platform/upstream/opencv.git
11 years agoMerge pull request #806 from bitwangyaoyao:2.4_fix
Vadim Pisarevsky [Fri, 12 Apr 2013 09:46:33 +0000 (13:46 +0400)]
Merge pull request #806 from bitwangyaoyao:2.4_fix

11 years agoMerge pull request #781 from bitwangyaoyao:2.4_fixerr
Vadim Pisarevsky [Fri, 12 Apr 2013 09:44:58 +0000 (13:44 +0400)]
Merge pull request #781 from bitwangyaoyao:2.4_fixerr

11 years agoremove the OpenCL Dir finding in CMake
yao [Fri, 12 Apr 2013 06:44:55 +0000 (14:44 +0800)]
remove the OpenCL Dir finding in CMake

11 years agoMerge pull request #796 from SpecLad:more-backports
Andrey Kamaev [Thu, 11 Apr 2013 11:48:16 +0000 (15:48 +0400)]
Merge pull request #796 from SpecLad:more-backports

11 years agoMerge pull request #799 from SpecLad:boost-initial-weights
Andrey Kamaev [Thu, 11 Apr 2013 11:47:57 +0000 (15:47 +0400)]
Merge pull request #799 from SpecLad:boost-initial-weights

11 years agoIn CvBoost, delegated update_weights's implementation to a helper method.
Roman Donchenko [Thu, 11 Apr 2013 09:43:51 +0000 (13:43 +0400)]
In CvBoost, delegated update_weights's implementation to a helper method.

This allows subclasses of CvBoost to override initial weights that
update_weights uses without duplicating its entire implementation.

11 years agoMerge pull request #793 from SpecLad:auto-cuda
Andrey Kamaev [Thu, 11 Apr 2013 08:24:04 +0000 (12:24 +0400)]
Merge pull request #793 from SpecLad:auto-cuda

11 years agoMerge pull request #794 from asmorkalov:android_no_layout
Andrey Kamaev [Thu, 11 Apr 2013 07:34:42 +0000 (11:34 +0400)]
Merge pull request #794 from asmorkalov:android_no_layout

11 years agoMerge pull request #792 from asmorkalov:manager_incompat_wh
Andrey Kamaev [Thu, 11 Apr 2013 07:34:21 +0000 (11:34 +0400)]
Merge pull request #792 from asmorkalov:manager_incompat_wh

11 years agoMerge pull request #742 from bitwangyaoyao:2.4_fix
Andrey Kamaev [Thu, 11 Apr 2013 07:33:45 +0000 (11:33 +0400)]
Merge pull request #742 from bitwangyaoyao:2.4_fix

11 years agoMerge pull request #740 from evil0sheep:2.4
Andrey Kamaev [Thu, 11 Apr 2013 07:33:30 +0000 (11:33 +0400)]
Merge pull request #740 from evil0sheep:2.4

11 years agoBackported RNG_MT19937 from master.
Roman Donchenko [Wed, 10 Apr 2013 15:39:38 +0000 (19:39 +0400)]
Backported RNG_MT19937 from master.

11 years agoBackported globbing from master.
Roman Donchenko [Wed, 10 Apr 2013 15:36:39 +0000 (19:36 +0400)]
Backported globbing from master.

11 years agoFeature #2893 Create Java sample without layout.xml implemented.
Alexander Smorkalov [Wed, 10 Apr 2013 09:38:59 +0000 (13:38 +0400)]
Feature #2893 Create Java sample without layout.xml implemented.

11 years agoAutomatically add CUDA support to a module if it has CUDA sources.
Roman Donchenko [Wed, 10 Apr 2013 08:20:54 +0000 (12:20 +0400)]
Automatically add CUDA support to a module if it has CUDA sources.

Backport from master.

11 years agoIncompatible hardware detetction added to OpenCV Manager(Feature #2941)
Alexander Smorkalov [Wed, 10 Apr 2013 06:43:22 +0000 (10:43 +0400)]
Incompatible hardware detetction added to OpenCV Manager(Feature #2941)

11 years agoMerge pull request #789 from asmorkalov:android_na_mk_fix
Andrey Kamaev [Tue, 9 Apr 2013 09:14:21 +0000 (13:14 +0400)]
Merge pull request #789 from asmorkalov:android_na_mk_fix

11 years agoNative activity build with Android.mk fixed.
Alexander Smorkalov [Tue, 9 Apr 2013 06:13:46 +0000 (10:13 +0400)]
Native activity build with Android.mk fixed.

11 years agoMerge pull request #782 from taka-no-me:bitness_detection
Andrey Kamaev [Tue, 9 Apr 2013 04:52:32 +0000 (08:52 +0400)]
Merge pull request #782 from taka-no-me:bitness_detection

11 years agoMerge pull request #776 from virtuald:2.4
Andrey Kamaev [Tue, 9 Apr 2013 04:51:09 +0000 (08:51 +0400)]
Merge pull request #776 from virtuald:2.4

11 years agoFix bitness detection for target platform
Andrey Kamaev [Sat, 6 Apr 2013 16:11:40 +0000 (20:11 +0400)]
Fix bitness detection for target platform

11 years agoMerge pull request #780 from sivapvarma:2.4
Andrey Kamaev [Mon, 8 Apr 2013 06:11:16 +0000 (10:11 +0400)]
Merge pull request #780 from sivapvarma:2.4

11 years agomerge add and sub into one set of kernels
yao [Sat, 6 Apr 2013 05:37:36 +0000 (13:37 +0800)]
merge add and sub into one set of kernels

11 years agoFix bug #2590
Siva Prasad Varma [Fri, 5 Apr 2013 13:39:09 +0000 (19:09 +0530)]
Fix bug #2590

replaced wrong check to correct check

11 years agoremove the C3 kernels in arithm, as the oclMat will never store 3 channels data
yao [Fri, 5 Apr 2013 13:29:29 +0000 (21:29 +0800)]
remove the C3 kernels in arithm, as the oclMat will never store 3 channels data

11 years agoMerge pull request #778 from asmorkalov:android_wanr_fix
Andrey Kamaev [Fri, 5 Apr 2013 09:00:20 +0000 (13:00 +0400)]
Merge pull request #778 from asmorkalov:android_wanr_fix

11 years agoMerge pull request #777 from taka-no-me:ocl_win_hang
Andrey Kamaev [Fri, 5 Apr 2013 09:00:03 +0000 (13:00 +0400)]
Merge pull request #777 from taka-no-me:ocl_win_hang

11 years agoMerge pull request #775 from bitwangyaoyao:2.4_fixerr
Andrey Kamaev [Fri, 5 Apr 2013 08:59:45 +0000 (12:59 +0400)]
Merge pull request #775 from bitwangyaoyao:2.4_fixerr

11 years agoMerge pull request #771 from gpsinghsandhu:surfFeatureFinder
Andrey Kamaev [Fri, 5 Apr 2013 08:59:22 +0000 (12:59 +0400)]
Merge pull request #771 from gpsinghsandhu:surfFeatureFinder

11 years agoMerge pull request #769 from apavlenko:fix_2901
Andrey Kamaev [Fri, 5 Apr 2013 08:59:01 +0000 (12:59 +0400)]
Merge pull request #769 from apavlenko:fix_2901

11 years agoWaning fixes for Android samples
Alexander Smorkalov [Fri, 5 Apr 2013 08:17:45 +0000 (12:17 +0400)]
Waning fixes for Android samples

11 years agoMerge pull request #772 from gpsinghsandhu:featureDescriptionTutorials
Andrey Kamaev [Fri, 5 Apr 2013 07:46:06 +0000 (11:46 +0400)]
Merge pull request #772 from gpsinghsandhu:featureDescriptionTutorials

11 years agoWorkaround hanging of ocl module when ocl API in not really used
Andrey Kamaev [Fri, 5 Apr 2013 07:01:28 +0000 (11:01 +0400)]
Workaround hanging of ocl module when ocl API in not really used

11 years agofix for #2901 (en exception was raised when getting empty MatOfDMatch)
Andrey Pavlenko [Fri, 5 Apr 2013 04:50:37 +0000 (08:50 +0400)]
fix for #2901 (en exception was raised when getting empty MatOfDMatch)

11 years agotest for the issue #2901
Andrey Pavlenko [Fri, 5 Apr 2013 04:50:24 +0000 (08:50 +0400)]
test for the issue #2901

11 years agocopying '.classpath' and '.project' to build dir, useful for opening in eclipse
Andrey Pavlenko [Fri, 5 Apr 2013 04:50:08 +0000 (08:50 +0400)]
copying '.classpath' and '.project' to build dir, useful for opening in eclipse

11 years agoCatch exceptions when large allocations fail
Dustin Spicuzza [Fri, 5 Apr 2013 04:43:10 +0000 (00:43 -0400)]
Catch exceptions when large allocations fail

11 years agoFix the problem of device selection on hybrid video systems.
yao [Fri, 5 Apr 2013 01:19:59 +0000 (09:19 +0800)]
Fix the problem of device selection on hybrid video systems.

11 years agomove the "cpu device checking" from supportsFeatures() to queryDeviceInfo()
yao [Fri, 5 Apr 2013 01:17:14 +0000 (09:17 +0800)]
move the "cpu device checking" from supportsFeatures() to queryDeviceInfo()

11 years agofix all redefine build errors on some Intel OCL
yao [Fri, 5 Apr 2013 00:15:05 +0000 (08:15 +0800)]
fix all redefine build errors on some Intel OCL

11 years agoanother update
Gurpinder Singh Sandhu [Thu, 4 Apr 2013 17:43:03 +0000 (23:13 +0530)]
another update

11 years agoFeature description tutorials made in sync with sample code
Gurpinder Singh Sandhu [Thu, 4 Apr 2013 17:42:18 +0000 (23:12 +0530)]
Feature description tutorials made in sync with sample code

sample code : https://github.com/Itseez/opencv/blob/master/samples/cpp/tutorial_code/features2D/SURF_descriptor.cpp

Bug #2888

11 years agosome typo
Gurpinder Singh Sandhu [Thu, 4 Apr 2013 17:24:27 +0000 (22:54 +0530)]
some typo

11 years agochanged surfFeaturesFinder::find() to allow CV_8UC1 type images
Gurpinder Singh Sandhu [Thu, 4 Apr 2013 17:22:07 +0000 (22:52 +0530)]
changed surfFeaturesFinder::find() to allow CV_8UC1 type images

http://code.opencv.org/issues/2926

11 years agoMerge pull request #770 from asmorkalov:winrt
Andrey Kamaev [Thu, 4 Apr 2013 16:01:55 +0000 (20:01 +0400)]
Merge pull request #770 from asmorkalov:winrt

11 years agoMerge pull request #760 from alekcac:2.4
Andrey Kamaev [Thu, 4 Apr 2013 14:44:34 +0000 (18:44 +0400)]
Merge pull request #760 from alekcac:2.4

11 years agoBuild warning fixes.
Alexander Smorkalov [Thu, 4 Apr 2013 06:11:33 +0000 (23:11 -0700)]
Build warning fixes.

11 years agoMerge pull request #767 from asmorkalov:version_increment
Andrey Kamaev [Thu, 4 Apr 2013 14:00:43 +0000 (18:00 +0400)]
Merge pull request #767 from asmorkalov:version_increment

11 years agoMerge pull request #766 from taka-no-me:try_compile_fix
Andrey Kamaev [Thu, 4 Apr 2013 14:00:22 +0000 (18:00 +0400)]
Merge pull request #766 from taka-no-me:try_compile_fix

11 years agoMerge pull request #764 from taka-no-me:svd
Andrey Kamaev [Thu, 4 Apr 2013 13:59:57 +0000 (17:59 +0400)]
Merge pull request #764 from taka-no-me:svd

11 years agoMerge pull request #762 from vpisarev:cvt_fix
Andrey Kamaev [Thu, 4 Apr 2013 13:59:27 +0000 (17:59 +0400)]
Merge pull request #762 from vpisarev:cvt_fix

11 years agoMerge pull request #759 from asmorkalov:android_common_fixes
Andrey Kamaev [Thu, 4 Apr 2013 13:58:44 +0000 (17:58 +0400)]
Merge pull request #759 from asmorkalov:android_common_fixes

11 years agoMerge pull request #758 from taka-no-me:do_not_use_opengl_without_ui
Andrey Kamaev [Thu, 4 Apr 2013 13:57:37 +0000 (17:57 +0400)]
Merge pull request #758 from taka-no-me:do_not_use_opengl_without_ui

11 years agoMerge pull request #756 from taka-no-me:libavcodec53.25.0
Andrey Kamaev [Thu, 4 Apr 2013 13:57:16 +0000 (17:57 +0400)]
Merge pull request #756 from taka-no-me:libavcodec53.25.0

11 years agoMerge pull request #755 from taka-no-me:add_checkinclude
Andrey Kamaev [Thu, 4 Apr 2013 13:56:52 +0000 (17:56 +0400)]
Merge pull request #755 from taka-no-me:add_checkinclude

11 years agoMerge pull request #753 from taka-no-me:fix_osx_fat_java
Andrey Kamaev [Thu, 4 Apr 2013 13:55:27 +0000 (17:55 +0400)]
Merge pull request #753 from taka-no-me:fix_osx_fat_java

11 years agoOpenCV verison incremented
Alexander Smorkalov [Thu, 4 Apr 2013 11:50:36 +0000 (15:50 +0400)]
OpenCV verison incremented

OpenCV Manager verison incremeneted;
Docs and tests updated accordingly;
COnstant for Manager initialization added.

11 years agoFix binary directory used in CMake try_compile commands
Andrey Kamaev [Thu, 4 Apr 2013 11:43:49 +0000 (15:43 +0400)]
Fix binary directory used in CMake try_compile commands

Old paths can have problems with cross-compilation

11 years agoremoved willowgarage.com links
Alexander Shishkov [Thu, 4 Apr 2013 10:33:00 +0000 (14:33 +0400)]
removed willowgarage.com links

11 years agoattempt to fix stereobm failures on Mac and Linux
Vadim Pisarevsky [Thu, 4 Apr 2013 10:27:11 +0000 (14:27 +0400)]
attempt to fix stereobm failures on Mac and Linux

11 years agoSVD: always update W vector for better algorithm convergency
Andrey Kamaev [Thu, 4 Apr 2013 09:55:36 +0000 (13:55 +0400)]
SVD: always update W vector for better algorithm convergency

11 years agoremoved links to the http://opencv.willowgarage.com/
Alexander Shishkov [Thu, 4 Apr 2013 09:44:28 +0000 (13:44 +0400)]
removed links to the opencv.willowgarage.com/

11 years agoSeveral fixes android related fixes
Alexander Smorkalov [Thu, 4 Apr 2013 08:18:13 +0000 (12:18 +0400)]
Several fixes android related fixes

Native activity build warning fixed;
Logcat messages for JavaCameraView updated (Bug #2876);
Some fixes for feature #2893 done.

11 years agoImprove CMake checks for the OpenGL availability
Andrey Kamaev [Thu, 4 Apr 2013 07:57:00 +0000 (11:57 +0400)]
Improve CMake checks for the OpenGL availability

Issue #2868

11 years agoFix ffmpeg wrapper compatibility with libavcodec > 53.25.0
Andrey Kamaev [Thu, 4 Apr 2013 07:27:43 +0000 (11:27 +0400)]
Fix ffmpeg wrapper compatibility with libavcodec > 53.25.0

Based on pull request #685

11 years agoAdd missed CMake include for check_include_file
Andrey Kamaev [Thu, 4 Apr 2013 07:04:51 +0000 (11:04 +0400)]
Add missed CMake include for check_include_file

Issue #2820

11 years agoMerge pull request #752 from khzimmer:2.4
Andrey Kamaev [Wed, 3 Apr 2013 20:57:33 +0000 (00:57 +0400)]
Merge pull request #752 from khzimmer:2.4

11 years agoMerge pull request #749 from taka-no-me:mingw64
Andrey Kamaev [Wed, 3 Apr 2013 20:56:10 +0000 (00:56 +0400)]
Merge pull request #749 from taka-no-me:mingw64

11 years agoMerge pull request #744 from pengx17:Branch_2.4_stereobp_ocl
Andrey Kamaev [Wed, 3 Apr 2013 20:55:03 +0000 (00:55 +0400)]
Merge pull request #744 from pengx17:Branch_2.4_stereobp_ocl

11 years agoFix link of fat java wrapper on OS X
Andrey Kamaev [Wed, 3 Apr 2013 16:02:13 +0000 (20:02 +0400)]
Fix link of fat java wrapper on OS X

11 years agoSet ptr to NULL, so this method can be called repeatedly. This fixes a crash after...
Karl-Heinz Zimmer [Wed, 3 Apr 2013 15:54:29 +0000 (17:54 +0200)]
Set ptr to NULL, so this method can be called repeatedly. This fixes a crash after unplugging web cam and trying to re-scan the cameras.

11 years agoFix target platform detection for x64 MinGW
Andrey Kamaev [Wed, 3 Apr 2013 12:30:33 +0000 (16:30 +0400)]
Fix target platform detection for x64 MinGW

11 years agoMerge pull request #745 from jet47:fix-gpu-warnings
Andrey Kamaev [Wed, 3 Apr 2013 11:44:46 +0000 (15:44 +0400)]
Merge pull request #745 from jet47:fix-gpu-warnings

11 years agoMerge pull request #716 from asmorkalov:winrt
Andrey Kamaev [Wed, 3 Apr 2013 11:39:57 +0000 (15:39 +0400)]
Merge pull request #716 from asmorkalov:winrt

11 years agoMerge pull request #748 from asmorkalov:android_na_install_fix
Andrey Kamaev [Wed, 3 Apr 2013 11:21:09 +0000 (15:21 +0400)]
Merge pull request #748 from asmorkalov:android_na_install_fix

11 years agoMerge pull request #743 from jet47:fix-sparsemat-iterator
Andrey Kamaev [Wed, 3 Apr 2013 11:18:11 +0000 (15:18 +0400)]
Merge pull request #743 from jet47:fix-sparsemat-iterator

11 years agoMerge pull request #738 from jet47:gpu-disable-videoenc-test
Andrey Kamaev [Wed, 3 Apr 2013 11:17:53 +0000 (15:17 +0400)]
Merge pull request #738 from jet47:gpu-disable-videoenc-test

11 years agoMerge pull request #728 from taka-no-me:ndk-r8e
Andrey Kamaev [Wed, 3 Apr 2013 11:17:37 +0000 (15:17 +0400)]
Merge pull request #728 from taka-no-me:ndk-r8e

11 years agoCode review notes fixed.
Alexander Smorkalov [Wed, 3 Apr 2013 10:48:23 +0000 (03:48 -0700)]
Code review notes fixed.

11 years agoNative activity install fixed.
Alexander Smorkalov [Wed, 3 Apr 2013 10:43:23 +0000 (14:43 +0400)]
Native activity install fixed.

11 years agofixed compilation warning for CUDA files
Vladislav Vinogradov [Wed, 3 Apr 2013 09:29:04 +0000 (13:29 +0400)]
fixed compilation warning for CUDA files

command line option '-Wsign-promo' is valid for C++/ObjC++ but not for C [enabled by default]

11 years agoFix compilation errors.
peng xiao [Wed, 3 Apr 2013 09:36:05 +0000 (17:36 +0800)]
Fix compilation errors.

11 years agoFix some build errors.
peng xiao [Wed, 3 Apr 2013 08:42:44 +0000 (16:42 +0800)]
Fix some build errors.

11 years agofixed SparseMat Iterator compilation error (bug #2921)
Vladislav Vinogradov [Wed, 3 Apr 2013 08:39:03 +0000 (12:39 +0400)]
fixed SparseMat Iterator compilation error (bug #2921)

11 years agoAdd ocl::stereobp function.
peng xiao [Wed, 3 Apr 2013 07:57:26 +0000 (15:57 +0800)]
Add ocl::stereobp function.

OpenCL StereoBeliefPropagation, ported from GPU implementation.

11 years agofix some mismatch on cpu device running OCL
yao [Wed, 3 Apr 2013 06:24:55 +0000 (14:24 +0800)]
fix some mismatch on cpu device running OCL

11 years agofix hog on some CPU device running ocl
yao [Wed, 3 Apr 2013 05:58:44 +0000 (13:58 +0800)]
fix hog on some CPU device running ocl

11 years agomake the sparse method give correct results on CPU ocl
yao [Wed, 3 Apr 2013 05:23:04 +0000 (13:23 +0800)]
make the sparse method give correct results on CPU ocl
Add CL_CPU to supportsFeature check
simplify the logic of pyrlk

11 years agoExperimental MS Media Foundation API support added
Alexander Smorkalov [Wed, 3 Apr 2013 01:01:20 +0000 (18:01 -0700)]
Experimental MS Media Foundation API support added

11 years agoAdded v4l2 support for getting capture property CV_CAP_PROP_POS_MSEC
dave [Tue, 2 Apr 2013 17:31:02 +0000 (10:31 -0700)]
Added v4l2 support for getting capture property CV_CAP_PROP_POS_MSEC

11 years agodisabled perf tests for gpu VideoWriter and VideoReader
Vladislav Vinogradov [Tue, 2 Apr 2013 12:49:09 +0000 (16:49 +0400)]
disabled perf tests for gpu VideoWriter and VideoReader

11 years agoMerge pull request #736 from bitwangyaoyao:2.4_clflush
Andrey Kamaev [Tue, 2 Apr 2013 11:25:19 +0000 (15:25 +0400)]
Merge pull request #736 from bitwangyaoyao:2.4_clflush

11 years agoMerge pull request #735 from jet47:fix-windows-issues
Andrey Kamaev [Tue, 2 Apr 2013 11:25:06 +0000 (15:25 +0400)]
Merge pull request #735 from jet47:fix-windows-issues

11 years agoMerge pull request #734 from apavlenko:fix_2806
Andrey Kamaev [Tue, 2 Apr 2013 11:24:53 +0000 (15:24 +0400)]
Merge pull request #734 from apavlenko:fix_2806

11 years agoMerge pull request #732 from apavlenko:disable_unstable_test
Andrey Kamaev [Tue, 2 Apr 2013 11:24:40 +0000 (15:24 +0400)]
Merge pull request #732 from apavlenko:disable_unstable_test

11 years agoMerge pull request #731 from bitwangyaoyao:2.4_fixDft
Andrey Kamaev [Tue, 2 Apr 2013 11:24:25 +0000 (15:24 +0400)]
Merge pull request #731 from bitwangyaoyao:2.4_fixDft

11 years agoMerge pull request #730 from vpisarev:ba_fix
Andrey Kamaev [Tue, 2 Apr 2013 11:24:12 +0000 (15:24 +0400)]
Merge pull request #730 from vpisarev:ba_fix

11 years agofixed nonfree test (run it only on one gpu device)
Vladislav Vinogradov [Tue, 2 Apr 2013 09:24:39 +0000 (13:24 +0400)]
fixed nonfree test (run it only on one gpu device)

11 years agofixed warnings
Vladislav Vinogradov [Tue, 2 Apr 2013 09:24:00 +0000 (13:24 +0400)]
fixed warnings

11 years agofixed assert condition (trueRightDisp can be empty)
Vladislav Vinogradov [Tue, 2 Apr 2013 09:23:03 +0000 (13:23 +0400)]
fixed assert condition (trueRightDisp can be empty)