platform/upstream/opencv.git
11 years agoAdded sample links in documentation for python2, ocl and gpu
StevenPuttemans [Fri, 2 Aug 2013 12:05:08 +0000 (14:05 +0200)]
Added sample links in documentation for python2, ocl and gpu

11 years agoMerge pull request #891 from NCBee:2.4
Andrey Pavlenko [Wed, 31 Jul 2013 12:38:14 +0000 (16:38 +0400)]
Merge pull request #891 from NCBee:2.4

11 years agoMerge pull request #1139 from StevenPuttemans:bugfix_3101
Andrey Pavlenko [Wed, 31 Jul 2013 11:14:03 +0000 (15:14 +0400)]
Merge pull request #1139 from StevenPuttemans:bugfix_3101

11 years agoMerge pull request #1019 from jet47:opengl-documentation
Andrey Pavlenko [Wed, 31 Jul 2013 11:10:26 +0000 (15:10 +0400)]
Merge pull request #1019 from jet47:opengl-documentation

11 years agoMerge pull request #1197 from apavlenko:fix_unstable_perf_tests
Andrey Pavlenko [Wed, 31 Jul 2013 11:07:19 +0000 (15:07 +0400)]
Merge pull request #1197 from apavlenko:fix_unstable_perf_tests

11 years agoMerge pull request #1206 from StevenPuttemans:feature_3169
Andrey Pavlenko [Wed, 31 Jul 2013 10:31:21 +0000 (14:31 +0400)]
Merge pull request #1206 from StevenPuttemans:feature_3169

11 years agoAdded all *.cpp samples reference to the 2.4.6 documentation as discussed in feature...
StevenPuttemans [Mon, 29 Jul 2013 13:51:16 +0000 (15:51 +0200)]
Added all *.cpp samples reference to the 2.4.6 documentation as discussed in feature #3169
- Used lunix style slashes - works on most systems
- Removed all trailing whitespaces

11 years agoMerge pull request #1207 from kirill-kornyakov:fix-for-readme
Andrey Pavlenko [Wed, 31 Jul 2013 05:23:37 +0000 (09:23 +0400)]
Merge pull request #1207 from kirill-kornyakov:fix-for-readme

11 years agoUpdated README.md
Kirill Kornyakov [Tue, 30 Jul 2013 14:51:53 +0000 (18:51 +0400)]
Updated README.md

11 years agoUpdated gitignore relative to new platforms dir
Kirill Kornyakov [Tue, 30 Jul 2013 14:48:20 +0000 (18:48 +0400)]
Updated gitignore relative to new platforms dir

11 years agoMerge pull request #1121 from pengx17:2.4_gftt_perf_test
Andrey Pavlenko [Tue, 30 Jul 2013 14:40:10 +0000 (18:40 +0400)]
Merge pull request #1121 from pengx17:2.4_gftt_perf_test

11 years agoMerge pull request #1172 from StevenPuttemans:bugfix_3166_24
Andrey Pavlenko [Tue, 30 Jul 2013 14:39:41 +0000 (18:39 +0400)]
Merge pull request #1172 from StevenPuttemans:bugfix_3166_24

11 years agoMerge pull request #1070 from Daniil-Osokin:calibrationSampleAndroid
Andrey Pavlenko [Tue, 30 Jul 2013 13:56:01 +0000 (17:56 +0400)]
Merge pull request #1070 from Daniil-Osokin:calibrationSampleAndroid

11 years agoMerge pull request #1098 from SeninAndrew:ximea_camera_bw_fix
Andrey Pavlenko [Tue, 30 Jul 2013 13:50:50 +0000 (17:50 +0400)]
Merge pull request #1098 from SeninAndrew:ximea_camera_bw_fix

11 years agoMerge pull request #1110 from SpecLad:config-cleanup
Andrey Pavlenko [Tue, 30 Jul 2013 13:39:35 +0000 (17:39 +0400)]
Merge pull request #1110 from SpecLad:config-cleanup

11 years agoMerge pull request #1177 from janstarzy:refactor
Andrey Pavlenko [Tue, 30 Jul 2013 13:39:09 +0000 (17:39 +0400)]
Merge pull request #1177 from janstarzy:refactor

11 years agoMerge pull request #1123 from bitwangyaoyao:2.4_fix
Andrey Pavlenko [Tue, 30 Jul 2013 13:13:26 +0000 (17:13 +0400)]
Merge pull request #1123 from bitwangyaoyao:2.4_fix

11 years agoMerge pull request #1193 from SpecLad:exports-for-contrarians
Andrey Pavlenko [Tue, 30 Jul 2013 12:50:28 +0000 (16:50 +0400)]
Merge pull request #1193 from SpecLad:exports-for-contrarians

11 years agofixing warning on shadowing local var (TEST_CYCLE_MULTIRUN uses 'r')
Andrey Pavlenko [Tue, 30 Jul 2013 12:42:45 +0000 (16:42 +0400)]
fixing warning on shadowing local var (TEST_CYCLE_MULTIRUN uses 'r')

11 years agoMerge pull request #1201 from alekcac:gittip
Andrey Pavlenko [Tue, 30 Jul 2013 12:35:58 +0000 (16:35 +0400)]
Merge pull request #1201 from alekcac:gittip

11 years agoMerge pull request #1185 from znah:cumpute_method_for_2_4
Andrey Pavlenko [Tue, 30 Jul 2013 11:46:47 +0000 (15:46 +0400)]
Merge pull request #1185 from znah:cumpute_method_for_2_4

11 years agoMerge pull request #1202 from hansmi:docfix3149
Andrey Pavlenko [Mon, 29 Jul 2013 11:29:22 +0000 (15:29 +0400)]
Merge pull request #1202 from hansmi:docfix3149

11 years agoMerge pull request #1190 from melody-rain:2.4_add_farneback_to_superres
Andrey Pavlenko [Mon, 29 Jul 2013 11:25:55 +0000 (15:25 +0400)]
Merge pull request #1190 from melody-rain:2.4_add_farneback_to_superres

11 years agoDocumentation fix for cv::compare (issue 3149)
Michael Hanselmann [Sun, 28 Jul 2013 14:18:12 +0000 (16:18 +0200)]
Documentation fix for cv::compare (issue 3149)

Since commit d8417af0860 (July 2011) cv::compare produces an array with
the same size and type as the input arrays.

Signed-off-by: Michael Hanselmann <public@hansmi.ch>
11 years agoUpdate README.md
Alexander Shishkov [Sat, 27 Jul 2013 21:01:46 +0000 (01:01 +0400)]
Update README.md

11 years agoUpdate README.md
Alexander Shishkov [Sat, 27 Jul 2013 20:37:38 +0000 (00:37 +0400)]
Update README.md

11 years agoRename README to README.md
Alexander Shishkov [Sat, 27 Jul 2013 20:25:07 +0000 (00:25 +0400)]
Rename README to README.md

11 years agoAdded gittip button
Alexander Shishkov [Sat, 27 Jul 2013 20:23:52 +0000 (00:23 +0400)]
Added gittip button

11 years agoadding/tuning multiple run for perf tests failing due to big deviation (functions...
Andrey Pavlenko [Fri, 26 Jul 2013 13:27:31 +0000 (17:27 +0400)]
adding/tuning multiple run for perf tests failing due to big deviation (functions using TBB can work so)

11 years agoFixed the setting of CVAPI_EXPORTS for modules that are always static/shared.
Roman Donchenko [Fri, 26 Jul 2013 10:35:40 +0000 (14:35 +0400)]
Fixed the setting of CVAPI_EXPORTS for modules that are always static/shared.

Also, removed needless check of BUILD_SHARED_LIBS in core; in that case,
only the current module's library type matters.

11 years agoMerge pull request #1191 from jet47:gpu-perf4au-fix
Roman Donchenko [Fri, 26 Jul 2013 09:01:41 +0000 (13:01 +0400)]
Merge pull request #1191 from jet47:gpu-perf4au-fix

11 years agofixed gpu_perf4au perf test (added cuda impl)
Vladislav Vinogradov [Fri, 26 Jul 2013 07:13:39 +0000 (11:13 +0400)]
fixed gpu_perf4au perf test (added cuda impl)

11 years agoAdded farneback to superres module.
Jin Ma [Fri, 26 Jul 2013 06:14:26 +0000 (14:14 +0800)]
Added farneback to superres module.

11 years agogenerating the lut table instead of hard coding one
yao [Fri, 26 Jul 2013 03:17:27 +0000 (11:17 +0800)]
generating the lut table instead of hard coding one

11 years agoAdded camera calibration sample for android
Daniil Osokin [Mon, 1 Jul 2013 20:53:18 +0000 (00:53 +0400)]
Added camera calibration sample for android

11 years agoremoved declaration of throwJavaException
Jan Starzynski [Thu, 25 Jul 2013 12:53:22 +0000 (14:53 +0200)]
removed declaration of throwJavaException

11 years agocompute method for Feature2D
Alexander Mordvintsev [Thu, 25 Jul 2013 12:22:31 +0000 (16:22 +0400)]
compute method for Feature2D

11 years agorefactored throwJavaException() and removed useless returns
Jan Starzynski [Thu, 25 Jul 2013 11:36:27 +0000 (13:36 +0200)]
refactored throwJavaException() and removed useless returns

11 years agoMerge pull request #1184 from apacha:Descriptor_Docu_FREAK_added_2
Roman Donchenko [Thu, 25 Jul 2013 08:00:55 +0000 (12:00 +0400)]
Merge pull request #1184 from apacha:Descriptor_Docu_FREAK_added_2

11 years agoAdded FREAK-descriptor extractor to documentation.
Alexander Pacha [Thu, 25 Jul 2013 04:40:09 +0000 (16:40 +1200)]
Added FREAK-descriptor extractor to documentation.
Previously it was missing.
Ordered all descriptors by year of first publication.

11 years agoremoved multiplied code for exception handling
Jan Starzynski [Wed, 24 Jul 2013 15:27:03 +0000 (17:27 +0200)]
removed multiplied code for exception handling

11 years agoMerge pull request #1169 from asmorkalov:winrt_tbb_dbg_wrn_fix
Roman Donchenko [Wed, 24 Jul 2013 12:08:17 +0000 (16:08 +0400)]
Merge pull request #1169 from asmorkalov:winrt_tbb_dbg_wrn_fix

11 years agoWarning suppresion for TBB on WinRT added.
Alexander Smorkalov [Mon, 22 Jul 2013 14:02:04 +0000 (07:02 -0700)]
Warning suppresion for TBB on WinRT added.

11 years agoMerge pull request #1168 from StevenPuttemans:feature_2753
Roman Donchenko [Tue, 23 Jul 2013 07:54:39 +0000 (11:54 +0400)]
Merge pull request #1168 from StevenPuttemans:feature_2753

11 years agoAdapted the reference underscore to link properly
StevenPuttemans [Tue, 23 Jul 2013 07:49:09 +0000 (09:49 +0200)]
Adapted the reference underscore to link properly

11 years agoFixed bug 3166 - added paper reference to stardetector code
StevenPuttemans [Tue, 23 Jul 2013 06:49:25 +0000 (08:49 +0200)]
Fixed bug 3166 - added paper reference to stardetector code

11 years agoMade change to install in windows guide, showing only difference between VS2010 and...
StevenPuttemans [Mon, 22 Jul 2013 13:16:22 +0000 (15:16 +0200)]
Made change to install in windows guide, showing only difference between VS2010 and VS2012

11 years agoMerge pull request #1165 from vpisarev:24_ipp
Roman Donchenko [Mon, 22 Jul 2013 11:34:13 +0000 (15:34 +0400)]
Merge pull request #1165 from vpisarev:24_ipp

11 years agoadded call to IPP's ippiDistanceTransform_5x5_8u32f_C1R (by Alexander Kapustin)
Vadim Pisarevsky [Mon, 22 Jul 2013 10:20:13 +0000 (14:20 +0400)]
added call to IPP's ippiDistanceTransform_5x5_8u32f_C1R (by Alexander Kapustin)

11 years agoMerge pull request #1161 from SpecLad:xls-comp-bug
Roman Donchenko [Mon, 22 Jul 2013 09:28:28 +0000 (13:28 +0400)]
Merge pull request #1161 from SpecLad:xls-comp-bug

11 years agoFix xls-report.py not working with more than one comparison.
Roman Donchenko [Mon, 22 Jul 2013 08:48:43 +0000 (12:48 +0400)]
Fix xls-report.py not working with more than one comparison.

11 years agoMerge pull request #1158 from StevenPuttemans:bugfix_3165
Andrey Pavlenko [Sun, 21 Jul 2013 14:47:16 +0000 (18:47 +0400)]
Merge pull request #1158 from StevenPuttemans:bugfix_3165

11 years agoMerge pull request #1156 from StevenPuttemans:bugfix_1873_new
Andrey Pavlenko [Sun, 21 Jul 2013 14:46:58 +0000 (18:46 +0400)]
Merge pull request #1156 from StevenPuttemans:bugfix_1873_new

11 years agoApplied bugfix #3165 : Changed min_eps value
StevenPuttemans [Fri, 19 Jul 2013 12:11:04 +0000 (14:11 +0200)]
Applied bugfix #3165 : Changed min_eps value

11 years agoMerge pull request #1148 from StevenPuttemans:patch_3125
Roman Donchenko [Fri, 19 Jul 2013 08:48:49 +0000 (12:48 +0400)]
Merge pull request #1148 from StevenPuttemans:patch_3125

11 years agoMerge pull request #1141 from apavlenko:fix_warning_unreach_code
Roman Donchenko [Fri, 19 Jul 2013 08:22:58 +0000 (12:22 +0400)]
Merge pull request #1141 from apavlenko:fix_warning_unreach_code

11 years agoMerge pull request #1150 from janstarzy:spelling
Roman Donchenko [Fri, 19 Jul 2013 08:15:30 +0000 (12:15 +0400)]
Merge pull request #1150 from janstarzy:spelling

11 years agoFixed bug 1873 : return image keypoint descriptors + fix on line 152 pure declaration
StevenPuttemans [Fri, 19 Jul 2013 07:29:48 +0000 (09:29 +0200)]
Fixed bug 1873 : return image keypoint descriptors + fix on line 152 pure declaration

11 years agominor improvement (consistency, readability)
Andrey Pavlenko [Thu, 18 Jul 2013 15:50:51 +0000 (19:50 +0400)]
minor improvement (consistency, readability)

11 years agoremoving unreachible code
Andrey Pavlenko [Thu, 18 Jul 2013 15:15:49 +0000 (19:15 +0400)]
removing unreachible code

11 years agoAdded brackets around line 888-892 for correct code!
StevenPuttemans [Thu, 18 Jul 2013 13:34:38 +0000 (15:34 +0200)]
Added brackets around line 888-892 for correct code!

11 years agofixed cpackage -> package
Jan Starzynski [Thu, 18 Jul 2013 13:33:25 +0000 (15:33 +0200)]
fixed cpackage -> package

11 years agoChanged first approach to a more general MS-specific approach.
StevenPuttemans [Thu, 18 Jul 2013 12:24:19 +0000 (14:24 +0200)]
Changed first approach to a more general MS-specific approach.
Suggested by @SpecLad

11 years agoMerge pull request #1137 from StevenPuttemans:bugfix_3131_24
Roman Donchenko [Thu, 18 Jul 2013 12:02:46 +0000 (16:02 +0400)]
Merge pull request #1137 from StevenPuttemans:bugfix_3131_24

11 years agocorrected some spelling errors
Jan Starzynski [Thu, 18 Jul 2013 11:24:55 +0000 (13:24 +0200)]
corrected some spelling errors

11 years agoMerge pull request #1147 from jet47:gpu-sanity-test-name
Roman Donchenko [Thu, 18 Jul 2013 10:29:47 +0000 (14:29 +0400)]
Merge pull request #1147 from jet47:gpu-sanity-test-name

11 years agoMerge pull request #1138 from janstarzy:mat-dist
Andrey Pavlenko [Thu, 18 Jul 2013 10:23:12 +0000 (14:23 +0400)]
Merge pull request #1138 from janstarzy:mat-dist

11 years agoremoved GPU_/CPU_ prefix from gpu's sanity test
Vladislav Vinogradov [Thu, 18 Jul 2013 09:41:27 +0000 (13:41 +0400)]
removed GPU_/CPU_ prefix from gpu's sanity test

11 years agoFixing bug #3131 adding breakpoints to featuretracker.cpp
StevenPuttemans [Wed, 17 Jul 2013 12:52:42 +0000 (14:52 +0200)]
Fixing bug #3131 adding breakpoints to featuretracker.cpp

11 years agoMerge pull request #1146 from jet47:fix-gpu-without-cufft-cublas
Roman Donchenko [Thu, 18 Jul 2013 08:54:09 +0000 (12:54 +0400)]
Merge pull request #1146 from jet47:fix-gpu-without-cufft-cublas

11 years agoMerge pull request #1145 from jet47:cuda-default-cc
Roman Donchenko [Thu, 18 Jul 2013 08:25:20 +0000 (12:25 +0400)]
Merge pull request #1145 from jet47:cuda-default-cc

11 years agofixed compilation without CUBLAS and CUFFT
Vladislav Vinogradov [Thu, 18 Jul 2013 07:24:34 +0000 (11:24 +0400)]
fixed compilation without CUBLAS and CUFFT

11 years agoupdated default parameters for CUDA CC in CMake:
Vladislav Vinogradov [Thu, 18 Jul 2013 05:44:00 +0000 (09:44 +0400)]
updated default parameters for CUDA CC in CMake:

* removed 2.0 PTX from default parameters since it has become obsolete
* added 3.5 BIN to prevent JIT compilation for super-Kepler

11 years agofixed strings in n1_dims(): n1_dcols() -> n1_dims()
Jan Starzynski [Wed, 17 Jul 2013 16:41:54 +0000 (18:41 +0200)]
fixed strings in n1_dims(): n1_dcols() -> n1_dims()

11 years agoMerge pull request #1131 from asmorkalov:winrt_tbb_dbg_fix
Roman Donchenko [Wed, 17 Jul 2013 14:48:20 +0000 (18:48 +0400)]
Merge pull request #1131 from asmorkalov:winrt_tbb_dbg_fix

11 years agoMerge pull request #1127 from SpecLad:np-1.7
Roman Donchenko [Wed, 17 Jul 2013 14:48:07 +0000 (18:48 +0400)]
Merge pull request #1127 from SpecLad:np-1.7

11 years agoMerge pull request #1136 from StevenPuttemans:bugfix_3157
Roman Donchenko [Wed, 17 Jul 2013 13:51:27 +0000 (17:51 +0400)]
Merge pull request #1136 from StevenPuttemans:bugfix_3157

11 years agoFixed bug #3101, problem on ellipse2poly function
StevenPuttemans [Wed, 17 Jul 2013 13:21:23 +0000 (15:21 +0200)]
Fixed bug #3101, problem on ellipse2poly function

11 years agoadding method dims() to core.Mat
Jan Starzynski [Wed, 17 Jul 2013 13:04:34 +0000 (15:04 +0200)]
adding method dims() to core.Mat

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 agoDebug build for WindowsRT with TBB fixed.
Alexander Smorkalov [Tue, 16 Jul 2013 14:37:09 +0000 (07:37 -0700)]
Debug build for WindowsRT with TBB fixed.

Debug library name prefix changed no "_debug" to fit pragmas in TBB
headers.

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 agoAdded the solution mentioned in patch #3125
StevenPuttemans [Wed, 17 Jul 2013 11:20:25 +0000 (13:20 +0200)]
Added the solution mentioned in patch #3125

11 years agoMerge pull request #1128 from SpecLad:ocl-tr1
Roman Donchenko [Wed, 17 Jul 2013 11:08:38 +0000 (15:08 +0400)]
Merge pull request #1128 from SpecLad:ocl-tr1

11 years agoMerge pull request #1105 from kdrobnyh:Integral-Image-IPP
Roman Donchenko [Wed, 17 Jul 2013 09:10:24 +0000 (13:10 +0400)]
Merge pull request #1105 from kdrobnyh:Integral-Image-IPP

11 years agoMerge pull request #1126 from asmorkalov:winrt
Roman Donchenko [Wed, 17 Jul 2013 09:08:29 +0000 (13:08 +0400)]
Merge pull request #1126 from asmorkalov:winrt

11 years agoMerge pull request #1129 from vpisarev:revert_bad_qtkit_patch
Roman Donchenko [Wed, 17 Jul 2013 08:16:59 +0000 (12:16 +0400)]
Merge pull request #1129 from vpisarev:revert_bad_qtkit_patch

11 years agoWindowsRT build warning fixes.
Alexander Smorkalov [Tue, 16 Jul 2013 09:03:50 +0000 (02:03 -0700)]
WindowsRT build warning fixes.

11 years agoa little simplify to pyrlk kernel
yao [Wed, 17 Jul 2013 06:35:44 +0000 (14:35 +0800)]
a little simplify to pyrlk kernel

11 years agorevert patch from PR 1074, since it break capturing on MacOSX
Vadim Pisarevsky [Tue, 16 Jul 2013 11:02:33 +0000 (15:02 +0400)]
revert patch from PR 1074, since it break capturing on MacOSX

11 years agoMade the Python bindings not use deprecated NumPy 1.7 API.
Roman Donchenko [Tue, 16 Jul 2013 10:33:15 +0000 (14:33 +0400)]
Made the Python bindings not use deprecated NumPy 1.7 API.

11 years agoFixed a compilation error (get<N> not found).
Roman Donchenko [Tue, 16 Jul 2013 10:23:05 +0000 (14:23 +0400)]
Fixed a compilation error (get<N> not found).

11 years agoFix compilation error on Mac
peng xiao [Tue, 16 Jul 2013 00:48:09 +0000 (08:48 +0800)]
Fix compilation error on Mac

11 years agoAdd ocl::gftt performance test.
peng xiao [Mon, 15 Jul 2013 08:27:27 +0000 (16:27 +0800)]
Add ocl::gftt performance test.

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 agofix hog mismatch on cpu ocl
yao [Mon, 15 Jul 2013 07:13:09 +0000 (15:13 +0800)]
fix hog mismatch on cpu 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 agoSorted cvconfig.h.cmake in alphabetical order.
Roman Donchenko [Thu, 11 Jul 2013 12:01:46 +0000 (16:01 +0400)]
Sorted cvconfig.h.cmake in alphabetical order.