platform/upstream/opencv.git
11 years agoCalib3d documentation:
Dominik Rose [Fri, 26 Apr 2013 09:34:35 +0000 (11:34 +0200)]
Calib3d documentation:
- fixed reference to Slabaugh

11 years agoMerge pull request #829 from SpecLad:sphinx-ver-1
Andrey Kamaev [Wed, 17 Apr 2013 11:45:53 +0000 (15:45 +0400)]
Merge pull request #829 from SpecLad:sphinx-ver-1

11 years agoMerge pull request #817 from pengx17:2.4_ocl_bitwise_cleanup
Andrey Kamaev [Wed, 17 Apr 2013 11:45:37 +0000 (15:45 +0400)]
Merge pull request #817 from pengx17:2.4_ocl_bitwise_cleanup

11 years agoRedo the Sphinx check to do the same thing on all platforms.
Roman Donchenko [Wed, 17 Apr 2013 08:21:17 +0000 (12:21 +0400)]
Redo the Sphinx check to do the same thing on all platforms.

This also fixes the bug where the Sphinx version gets detected as
"Sphinx vX.Y.Z" instead of "X.Y.Z" on Unix-like systems.

11 years agoMerge pull request #826 from pengx17:2.4_canny_clampfix
Andrey Kamaev [Wed, 17 Apr 2013 07:09:49 +0000 (11:09 +0400)]
Merge pull request #826 from pengx17:2.4_canny_clampfix

11 years agoMerge pull request #825 from pengx17:2.4_query_cpu_wavesize
Andrey Kamaev [Wed, 17 Apr 2013 07:09:36 +0000 (11:09 +0400)]
Merge pull request #825 from pengx17:2.4_query_cpu_wavesize

11 years agoMerge pull request #822 from taka-no-me:better_cv_enum
Andrey Kamaev [Wed, 17 Apr 2013 07:08:58 +0000 (11:08 +0400)]
Merge pull request #822 from taka-no-me:better_cv_enum

11 years agoAdd clamping for y dimension.
peng xiao [Tue, 16 Apr 2013 07:49:15 +0000 (15:49 +0800)]
Add clamping for y dimension.

11 years agoLet wave_size=1 on CPU.
peng xiao [Tue, 16 Apr 2013 06:41:30 +0000 (14:41 +0800)]
Let wave_size=1 on CPU.

11 years agoMerge pull request #821 from taka-no-me:contributing
Andrey Kamaev [Tue, 16 Apr 2013 06:16:14 +0000 (10:16 +0400)]
Merge pull request #821 from taka-no-me:contributing

11 years agoEliminate the need of ::testsing::ValuesIn() for CV_ENUM
Andrey Kamaev [Mon, 15 Apr 2013 15:39:49 +0000 (19:39 +0400)]
Eliminate the need of ::testsing::ValuesIn() for CV_ENUM

Also cv::, cv::gpu:: and cv::ocl:: namespace prefixes can be safely omitted
inside CV_ENUM and CV_FLAGS

11 years agoAdd contributing page for Github
Andrey Kamaev [Mon, 15 Apr 2013 12:57:58 +0000 (16:57 +0400)]
Add contributing page for Github

11 years agoMerge pull request #814 from taka-no-me:gtest_r652
Andrey Kamaev [Mon, 15 Apr 2013 08:13:16 +0000 (12:13 +0400)]
Merge pull request #814 from taka-no-me:gtest_r652

11 years agoMerge pull request #811 from pengx17:2.4_ocl_bfmatcher_newtype
Andrey Kamaev [Mon, 15 Apr 2013 08:12:17 +0000 (12:12 +0400)]
Merge pull request #811 from pengx17:2.4_ocl_bfmatcher_newtype

11 years agoMerge ocl and/or/xor operators into one kernel each.
peng xiao [Mon, 15 Apr 2013 02:36:03 +0000 (10:36 +0800)]
Merge ocl and/or/xor operators into one kernel each.

11 years agoFix build issues
Andrey Kamaev [Sat, 13 Apr 2013 12:53:59 +0000 (16:53 +0400)]
Fix build issues

11 years agoUpdate gtest to upstream r652
Andrey Kamaev [Sat, 13 Apr 2013 12:29:05 +0000 (16:29 +0400)]
Update gtest to upstream r652

It is already marked as a gtest 1.7.0

11 years agoUse a faster way to count 1's (used by Hamming)
Peng Xiao [Sat, 13 Apr 2013 06:34:30 +0000 (14:34 +0800)]
Use a faster way to count 1's (used by Hamming)

11 years agoMerge branch '2.4_ocl_bfmatcher_newtype' of https://github.com/pengx17/opencv into...
Peng Xiao [Sat, 13 Apr 2013 06:09:21 +0000 (14:09 +0800)]
Merge branch '2.4_ocl_bfmatcher_newtype' of https://github.com/pengx17/opencv into 2.4_ocl_bfmatcher_newtype

11 years agoAllow more query/train types for ocl::bfmatcher
Peng Xiao [Sat, 13 Apr 2013 06:08:58 +0000 (14:08 +0800)]
Allow more query/train types for ocl::bfmatcher

11 years agoAllow more input query/train types for ocl::bfmatcher
Peng Xiao [Sat, 13 Apr 2013 05:42:26 +0000 (13:42 +0800)]
Allow more input query/train types for ocl::bfmatcher

RadiusMatch for HammingDist cannot pass yet.

11 years agoEnable runtime type definition in kernels
Peng Xiao [Sat, 13 Apr 2013 04:50:17 +0000 (12:50 +0800)]
Enable runtime type definition in kernels

11 years agoPass query type T into kernel
Peng Xiao [Sat, 13 Apr 2013 03:39:13 +0000 (11:39 +0800)]
Pass query type T into kernel

11 years agoUntabify
Peng Xiao [Sat, 13 Apr 2013 03:22:22 +0000 (11:22 +0800)]
Untabify

11 years agoAdd HammingDist test case
Peng Xiao [Sat, 13 Apr 2013 03:07:26 +0000 (11:07 +0800)]
Add HammingDist test case

11 years agoMerge pull request #802 from SpecLad:shebang
Andrey Kamaev [Fri, 12 Apr 2013 11:00:28 +0000 (15:00 +0400)]
Merge pull request #802 from SpecLad:shebang

11 years agoMerge pull request #808 from bitwangyaoyao:2.4_mac
Andrey Kamaev [Fri, 12 Apr 2013 10:59:45 +0000 (14:59 +0400)]
Merge pull request #808 from bitwangyaoyao:2.4_mac

11 years agoMerge pull request #804 from gpsinghsandhu:staticCast
Andrey Kamaev [Fri, 12 Apr 2013 10:59:26 +0000 (14:59 +0400)]
Merge pull request #804 from gpsinghsandhu:staticCast

11 years agoMerge pull request #801 from kirill-kornyakov:lkdemo-fix
Andrey Kamaev [Fri, 12 Apr 2013 10:59:11 +0000 (14:59 +0400)]
Merge pull request #801 from kirill-kornyakov:lkdemo-fix

11 years agoMerge pull request #807 from pengx17:2.4_ocl_bfm_opt
Vadim Pisarevsky [Fri, 12 Apr 2013 09:46:55 +0000 (13:46 +0400)]
Merge pull request #807 from pengx17:2.4_ocl_bfm_opt

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 agofix the compile errors on Mac
yao [Fri, 12 Apr 2013 09:38:59 +0000 (17:38 +0800)]
fix the compile errors on Mac

11 years agoCapitalize macro namings.
peng xiao [Fri, 12 Apr 2013 08:56:49 +0000 (16:56 +0800)]
Capitalize macro namings.

11 years agoRename test case category and code clean up.
peng xiao [Fri, 12 Apr 2013 08:54:06 +0000 (16:54 +0800)]
Rename test case category and code clean up.

11 years agoFix build error on linux.
peng xiao [Fri, 12 Apr 2013 08:52:21 +0000 (16:52 +0800)]
Fix build error on linux.

11 years agoFurther optimize bfmatcher by passing macros.
peng xiao [Fri, 12 Apr 2013 08:51:36 +0000 (16:51 +0800)]
Further optimize bfmatcher by passing macros.

11 years agoOptimize bfmatcher by passing macros.
peng xiao [Fri, 12 Apr 2013 08:50:30 +0000 (16:50 +0800)]
Optimize bfmatcher by passing macros.

11 years agoReplace create with ensureSizeIsEnough thus buffer objects can be reused.
peng xiao [Fri, 12 Apr 2013 08:47:44 +0000 (16:47 +0800)]
Replace create with ensureSizeIsEnough thus buffer objects can be reused.

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 agochanged reinterpret_cast to static_cast
Gurpinder Singh Sandhu [Thu, 11 Apr 2013 17:02:50 +0000 (22:32 +0530)]
changed reinterpret_cast to static_cast

This issue seem to be lingering around for quite some time
https://github.com/Itseez/opencv/pull/639
http://code.opencv.org/issues/2819

11 years agoFixed the shebang lines on the Python scripts.
Roman Donchenko [Thu, 11 Apr 2013 14:34:04 +0000 (18:34 +0400)]
Fixed the shebang lines on the Python scripts.

Also, removed the one from modules/python/src2/cv.py and cleared its
executable bit, since it's not a script.

11 years agoMinor code cleanings in lkdemo.cpp
Kirill Kornyakov [Thu, 11 Apr 2013 13:57:33 +0000 (17:57 +0400)]
Minor code cleanings in lkdemo.cpp

11 years ago#2813 bugfix
Kirill Kornyakov [Thu, 11 Apr 2013 13:50:10 +0000 (17:50 +0400)]
#2813 bugfix

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