platform/upstream/opencv.git
10 years agoPlace Python library out in dedicated folder
Michael Pratt [Wed, 6 Aug 2014 06:31:30 +0000 (02:31 -0400)]
Place Python library out in dedicated folder

Place the built Python module library in a dedicated folder inside of
lib/.  This ensures that even if the Python 2 and Python 3 module names
conflict, they will not overwrite one another.

10 years agoFix a few more PYTHON_NUMPY_INCLUDE_PATH
Michael Pratt [Wed, 6 Aug 2014 06:30:35 +0000 (02:30 -0400)]
Fix a few more PYTHON_NUMPY_INCLUDE_PATH

The previous commit fixing references to PYTHON_NUMPY_INCLUDE_PATH
missed a few unset()s.

10 years agoMerge branch 'master' into python2and3
Michael Pratt [Wed, 6 Aug 2014 05:45:07 +0000 (01:45 -0400)]
Merge branch 'master' into python2and3

10 years agoMerge pull request #3045 from vbystricky:ocl_MeanStdDevFix
Alexander Alekhin [Tue, 5 Aug 2014 14:52:22 +0000 (14:52 +0000)]
Merge pull request #3045 from vbystricky:ocl_MeanStdDevFix

10 years agoMerge pull request #3043 from vbystricky:ocl_ConvertToAccurTestFix
Alexander Alekhin [Tue, 5 Aug 2014 14:17:06 +0000 (14:17 +0000)]
Merge pull request #3043 from vbystricky:ocl_ConvertToAccurTestFix

10 years agoMerge pull request #3035 from ElenaGvozdeva:ocl_test_fix
Alexander Alekhin [Tue, 5 Aug 2014 14:16:16 +0000 (14:16 +0000)]
Merge pull request #3035 from ElenaGvozdeva:ocl_test_fix

10 years agoFix error in OpenCl version of meanstddev for continues src and not continues mask
vbystricky [Tue, 5 Aug 2014 13:30:06 +0000 (17:30 +0400)]
Fix error in OpenCl version of meanstddev for continues src and not continues mask

10 years agoFix epsilon for OpenCL function ConverTo, for convertation from float to integer...
vbystricky [Tue, 5 Aug 2014 12:34:23 +0000 (16:34 +0400)]
Fix epsilon for OpenCL function ConverTo, for convertation from float to integer types

10 years agofixed ocl_integral
Elena Gvozdeva [Tue, 5 Aug 2014 07:55:18 +0000 (11:55 +0400)]
fixed ocl_integral

10 years agofixed test for CvtColor RGB -> Luv
Elena Gvozdeva [Mon, 4 Aug 2014 10:15:21 +0000 (14:15 +0400)]
fixed test for CvtColor RGB -> Luv

10 years agofixed ocl tests for BlendLinear, BoxFilter, Integral
Elena Gvozdeva [Mon, 4 Aug 2014 07:28:48 +0000 (11:28 +0400)]
fixed ocl tests for BlendLinear, BoxFilter, Integral

10 years agoMerge pull request #2879 from alalek:ocl_runtime_flags
Vadim Pisarevsky [Mon, 4 Aug 2014 16:43:00 +0000 (16:43 +0000)]
Merge pull request #2879 from alalek:ocl_runtime_flags

10 years agoMerge pull request #3036 from vbystricky:ocl_NormAccurTestFix
Vadim Pisarevsky [Mon, 4 Aug 2014 14:54:12 +0000 (14:54 +0000)]
Merge pull request #3036 from vbystricky:ocl_NormAccurTestFix

10 years agoMerge pull request #3032 from vpisarev:refactor_ml2
Vadim Pisarevsky [Mon, 4 Aug 2014 14:51:37 +0000 (14:51 +0000)]
Merge pull request #3032 from vpisarev:refactor_ml2

10 years agoPrevent generating test case with mask filled 0 only
vbystricky [Mon, 4 Aug 2014 11:12:36 +0000 (15:12 +0400)]
Prevent generating test case with mask filled 0 only

10 years agofixed more compile warnings on Windows
Vadim Pisarevsky [Mon, 4 Aug 2014 10:22:31 +0000 (14:22 +0400)]
fixed more compile warnings on Windows

10 years agoMerge pull request #3034 from jet47:fix-compilation
Vadim Pisarevsky [Mon, 4 Aug 2014 09:38:34 +0000 (09:38 +0000)]
Merge pull request #3034 from jet47:fix-compilation

10 years agofix test_opencv_imgproc compilation
Vladislav Vinogradov [Mon, 4 Aug 2014 08:13:33 +0000 (12:13 +0400)]
fix test_opencv_imgproc compilation

10 years agofix python module compilation with enabled CUDA support:
Vladislav Vinogradov [Mon, 4 Aug 2014 08:12:51 +0000 (12:12 +0400)]
fix python module compilation with enabled CUDA support:

filterout all CUDA related headers from python module include headers

10 years agoMerge pull request #3030 from vbystricky:ocl_DotReduceAccurTestFix
Alexander Alekhin [Mon, 4 Aug 2014 08:09:38 +0000 (08:09 +0000)]
Merge pull request #3030 from vbystricky:ocl_DotReduceAccurTestFix

10 years agohopefully fixed test failure on Linux
Vadim Pisarevsky [Sun, 3 Aug 2014 21:16:45 +0000 (01:16 +0400)]
hopefully fixed test failure on Linux

10 years agocontinuing to debug boost and fix MSVC compile errors
Vadim Pisarevsky [Sun, 3 Aug 2014 17:21:11 +0000 (21:21 +0400)]
continuing to debug boost and fix MSVC compile errors

10 years agofixed the condition
Vadim Pisarevsky [Sun, 3 Aug 2014 09:15:43 +0000 (13:15 +0400)]
fixed the condition

10 years agomore fixes and more debugging code
Vadim Pisarevsky [Sun, 3 Aug 2014 09:08:03 +0000 (13:08 +0400)]
more fixes and more debugging code

10 years agofixed compile warnings from MSVC; fixed warnings in Python bindings; added some debug...
Vadim Pisarevsky [Sun, 3 Aug 2014 08:46:28 +0000 (12:46 +0400)]
fixed compile warnings from MSVC; fixed warnings in Python bindings; added some debugging code

10 years agotemporarily disabled java bindings for ml; hopefully fixed warnings etc.
Vadim Pisarevsky [Sun, 3 Aug 2014 00:28:31 +0000 (04:28 +0400)]
temporarily disabled java bindings for ml; hopefully fixed warnings etc.

10 years agotemporarily disabled java bindings for ml; hopefully fixed warnings etc.
Vadim Pisarevsky [Sun, 3 Aug 2014 00:28:20 +0000 (04:28 +0400)]
temporarily disabled java bindings for ml; hopefully fixed warnings etc.

10 years agoremoved many extra whitespaces; fixed 1 warning
Vadim Pisarevsky [Sat, 2 Aug 2014 23:08:25 +0000 (03:08 +0400)]
removed many extra whitespaces; fixed 1 warning

10 years agofixed building html docs
Vadim Pisarevsky [Sat, 2 Aug 2014 22:34:47 +0000 (02:34 +0400)]
fixed building html docs

10 years agoMerge pull request #3027 from vbystricky:cvtColorLuv2RGB
Vadim Pisarevsky [Sat, 2 Aug 2014 21:52:24 +0000 (21:52 +0000)]
Merge pull request #3027 from vbystricky:cvtColorLuv2RGB

10 years agoupdated docs
Vadim Pisarevsky [Sat, 2 Aug 2014 21:41:30 +0000 (01:41 +0400)]
updated docs

10 years agomade everything compile and even run somehow
Vadim Pisarevsky [Sat, 2 Aug 2014 21:41:09 +0000 (01:41 +0400)]
made everything compile and even run somehow

10 years agoIncrease epsilon for OpenCL version UMatDot and ReduceAvg accurency tests
VBystricky [Sat, 2 Aug 2014 09:21:34 +0000 (13:21 +0400)]
Increase epsilon for OpenCL version UMatDot and ReduceAvg accurency tests

10 years agoMerge pull request #3011 from vbystricky:oclopt_morthosmall
Alexander Alekhin [Fri, 1 Aug 2014 17:21:59 +0000 (17:21 +0000)]
Merge pull request #3011 from vbystricky:oclopt_morthosmall

10 years agoMerge pull request #3028 from vbystricky:ocl_MergeAccurTestFix
Alexander Alekhin [Fri, 1 Aug 2014 17:15:53 +0000 (17:15 +0000)]
Merge pull request #3028 from vbystricky:ocl_MergeAccurTestFix

10 years agoMerge pull request #3029 from vbystricky:ocl_UMatOpAccurTestFix
Alexander Alekhin [Fri, 1 Aug 2014 17:15:38 +0000 (17:15 +0000)]
Merge pull request #3029 from vbystricky:ocl_UMatOpAccurTestFix

10 years agoChange min-max to clamp
VBystricky [Fri, 1 Aug 2014 15:45:11 +0000 (19:45 +0400)]
Change min-max to clamp

10 years agoFix accurency test for OpenCL matrix operations
vbystricky [Fri, 1 Aug 2014 14:30:20 +0000 (18:30 +0400)]
Fix accurency test for OpenCL matrix operations

10 years agoFix accurency test of OpenCL merge function.
vbystricky [Fri, 1 Aug 2014 13:53:24 +0000 (17:53 +0400)]
Fix accurency test of OpenCL merge function.

10 years agoMerge pull request #2671 from syilma:HomographyDecomp
Vadim Pisarevsky [Fri, 1 Aug 2014 13:08:20 +0000 (13:08 +0000)]
Merge pull request #2671 from syilma:HomographyDecomp

10 years agoMerge pull request #3018 from fradelg:master
Vadim Pisarevsky [Fri, 1 Aug 2014 13:06:36 +0000 (13:06 +0000)]
Merge pull request #3018 from fradelg:master

10 years agoFix Luv2RGB function
vbystricky [Fri, 1 Aug 2014 10:18:35 +0000 (14:18 +0400)]
Fix Luv2RGB function

10 years agoMerge pull request #3024 from jet47:fix-cudabgsegm-compilation
Vadim Pisarevsky [Fri, 1 Aug 2014 09:42:40 +0000 (09:42 +0000)]
Merge pull request #3024 from jet47:fix-cudabgsegm-compilation

10 years agoMerge pull request #2608 from Siddharthk:master
Vadim Pisarevsky [Fri, 1 Aug 2014 09:13:32 +0000 (09:13 +0000)]
Merge pull request #2608 from Siddharthk:master

10 years agoMerge pull request #3023 from vbystricky:ocl_minMaxLoc
Alexander Alekhin [Fri, 1 Aug 2014 08:57:37 +0000 (08:57 +0000)]
Merge pull request #3023 from vbystricky:ocl_minMaxLoc

10 years agoRemoved OpticalFlowBM test from cudaoptflow module
Fco. Javier Delgado del Hoyo [Fri, 1 Aug 2014 07:28:19 +0000 (09:28 +0200)]
Removed OpticalFlowBM test from cudaoptflow module

10 years agoMerge pull request #3009 from vpisarev:ios_experiments
Vadim Pisarevsky [Thu, 31 Jul 2014 18:20:07 +0000 (18:20 +0000)]
Merge pull request #3009 from vpisarev:ios_experiments

10 years agoMerge pull request #3002 from vbystricky:oclopt_pyrdown
Alexander Alekhin [Thu, 31 Jul 2014 15:43:18 +0000 (15:43 +0000)]
Merge pull request #3002 from vbystricky:oclopt_pyrdown

10 years agoEnable ocl version of minmaxloc with mask
vbystricky [Thu, 31 Jul 2014 15:12:10 +0000 (19:12 +0400)]
Enable ocl version of minmaxloc with mask

10 years agoFix error in OCL minmaxloc
vbystricky [Thu, 31 Jul 2014 13:29:06 +0000 (17:29 +0400)]
Fix error in OCL minmaxloc

10 years agoMerge pull request #3021 from ElenaGvozdeva:ocl_flip
Alexander Alekhin [Thu, 31 Jul 2014 13:56:44 +0000 (13:56 +0000)]
Merge pull request #3021 from ElenaGvozdeva:ocl_flip

10 years agofix cudabgsegm module compilation
Vladislav Vinogradov [Thu, 31 Jul 2014 13:55:59 +0000 (17:55 +0400)]
fix cudabgsegm module compilation

10 years agofixed ocl_flip for cn==3
Elena Gvozdeva [Thu, 31 Jul 2014 11:21:52 +0000 (15:21 +0400)]
fixed ocl_flip for cn==3

10 years agoMerge pull request #3020 from vpisarev:ocl_disable_more_funcs
Vadim Pisarevsky [Thu, 31 Jul 2014 12:54:13 +0000 (12:54 +0000)]
Merge pull request #3020 from vpisarev:ocl_disable_more_funcs

10 years agotrying to make the tests pass
Vadim Pisarevsky [Thu, 31 Jul 2014 10:24:21 +0000 (14:24 +0400)]
trying to make the tests pass

10 years agocontinuing refactoring ml samples; added "max vote" response to ANN_MLP. Probably...
Vadim Pisarevsky [Thu, 31 Jul 2014 10:12:10 +0000 (14:12 +0400)]
continuing refactoring ml samples; added "max vote" response to ANN_MLP. Probably, should make it in less hacky way

10 years agoReference PYTHON_NUMPY_INCLUDE_DIRS not PYTHON_NUMPY_INCLUDE_PATH
Michael Pratt [Thu, 31 Jul 2014 07:27:06 +0000 (03:27 -0400)]
Reference PYTHON_NUMPY_INCLUDE_DIRS not PYTHON_NUMPY_INCLUDE_PATH

PYTHON_NUMPY_INCLUDE_PATH was a typo, it should have been
PYTHON_NUMPY_INCLUDE_DIRS.

10 years agoRemoved cvCalcOpticalFlowBM from cudaoptflow test
Fco. Javier Delgado del Hoyo [Thu, 31 Jul 2014 07:21:44 +0000 (09:21 +0200)]
Removed cvCalcOpticalFlowBM from cudaoptflow test

10 years agoRemoved cvCalcOpticalFlowBM from performance test
Fco. Javier Delgado del Hoyo [Thu, 31 Jul 2014 07:08:29 +0000 (09:08 +0200)]
Removed cvCalcOpticalFlowBM from performance test

10 years agoMerge branch 'master' into python2and3
Michael Pratt [Thu, 31 Jul 2014 05:11:30 +0000 (01:11 -0400)]
Merge branch 'master' into python2and3

10 years agoMerge remote-tracking branch 'upstream/master' into HomographyDecomp
Samson Yilma [Thu, 31 Jul 2014 00:36:41 +0000 (20:36 -0400)]
Merge remote-tracking branch 'upstream/master' into HomographyDecomp

10 years agoadded comment.
Samson Yilma [Wed, 30 Jul 2014 23:32:37 +0000 (19:32 -0400)]
added comment.

10 years agoupdated documentation for decomposeHomography
Samson Yilma [Wed, 30 Jul 2014 22:53:33 +0000 (18:53 -0400)]
updated documentation for decomposeHomography

10 years agofixed compilation of some samples; fixed ANN_MLP::predict
Vadim Pisarevsky [Wed, 30 Jul 2014 18:53:46 +0000 (22:53 +0400)]
fixed compilation of some samples; fixed ANN_MLP::predict

10 years agoMerge pull request #2983 from wnoise:shrink-global-cuda-usage
Vadim Pisarevsky [Wed, 30 Jul 2014 15:55:02 +0000 (15:55 +0000)]
Merge pull request #2983 from wnoise:shrink-global-cuda-usage

10 years agoput IPP ReduceSum_32f back
Vadim Pisarevsky [Wed, 30 Jul 2014 15:12:11 +0000 (19:12 +0400)]
put IPP ReduceSum_32f back

10 years agoMerge pull request #3017 from f-morozov:akaze
Vadim Pisarevsky [Wed, 30 Jul 2014 15:03:47 +0000 (15:03 +0000)]
Merge pull request #3017 from f-morozov:akaze

10 years ago1. disabled OpenCL acceleration for cv::multiply() (CV_32F), cv::divide (CV_32F)...
Vadim Pisarevsky [Wed, 30 Jul 2014 14:19:47 +0000 (18:19 +0400)]
1. disabled OpenCL acceleration for cv::multiply() (CV_32F), cv::divide (CV_32F), cv::convertScaleAbs (CV_32F) and cv::reduce (SUM, CV_32F), cv::reduce (MIN & MAX), cv::flip (3-channel case).
2. changed the number of test loops from 1 to 30 (except for cv::pow() test, which fails for yet unknown reason)
3. disabled IPP acceleration for 3-channel norms.
4. modified relativeNorm test function to handle very small values

10 years agoAKAZE fixes, tests and tutorial
f-morozov [Wed, 30 Jul 2014 14:02:08 +0000 (18:02 +0400)]
AKAZE fixes, tests and tutorial

10 years agoMerge pull request #2992 from snikulov:upmerge_jpeg_tweak
Vadim Pisarevsky [Wed, 30 Jul 2014 12:48:41 +0000 (12:48 +0000)]
Merge pull request #2992 from snikulov:upmerge_jpeg_tweak

10 years agofixed python bindings generation
Vadim Pisarevsky [Wed, 30 Jul 2014 12:11:08 +0000 (16:11 +0400)]
fixed python bindings generation

10 years agoFix some problems
vbystricky [Wed, 30 Jul 2014 07:56:28 +0000 (11:56 +0400)]
Fix some problems

10 years agoRemoved opencv_legacy dependency from cudaoptflow
Fco. Javier Delgado del Hoyo [Wed, 30 Jul 2014 07:00:23 +0000 (09:00 +0200)]
Removed opencv_legacy dependency from cudaoptflow

10 years agoOptimize OpenCL version of morfology and box filters for small filter kernels
vbystricky [Mon, 28 Jul 2014 11:48:02 +0000 (15:48 +0400)]
Optimize OpenCL version of morfology and box filters for small filter kernels

10 years ago#2992: update after review
Sergei Nikulov [Tue, 29 Jul 2014 20:03:41 +0000 (00:03 +0400)]
#2992: update after review

10 years agoinitial commit; ml has been refactored; it compiles and the tests run well; some...
Vadim Pisarevsky [Tue, 29 Jul 2014 19:54:23 +0000 (23:54 +0400)]
initial commit; ml has been refactored; it compiles and the tests run well; some other modules, apps and samples do not compile; to be fixed

10 years agoMerge pull request #2940 from davembradley:master
Vadim Pisarevsky [Tue, 29 Jul 2014 17:22:30 +0000 (17:22 +0000)]
Merge pull request #2940 from davembradley:master

10 years agoMerge pull request #2991 from kovand11:calibrateDebevecFix
Vadim Pisarevsky [Tue, 29 Jul 2014 16:58:32 +0000 (16:58 +0000)]
Merge pull request #2991 from kovand11:calibrateDebevecFix

10 years agoMerge pull request #3012 from vpisarev:clean_objdetect
Andrey Pavlenko [Tue, 29 Jul 2014 15:29:35 +0000 (15:29 +0000)]
Merge pull request #3012 from vpisarev:clean_objdetect

10 years agoeliminated some unnecessary instructions
Vadim Pisarevsky [Tue, 29 Jul 2014 14:10:18 +0000 (18:10 +0400)]
eliminated some unnecessary instructions

10 years agoMerge pull request #3016 from fradelg:master
Vadim Pisarevsky [Tue, 29 Jul 2014 13:50:35 +0000 (13:50 +0000)]
Merge pull request #3016 from fradelg:master

10 years agoAnother typo in comment inside OpenNI2 cmake file
Fco. Javier Delgado del Hoyo [Tue, 29 Jul 2014 09:13:00 +0000 (11:13 +0200)]
Another typo in comment inside OpenNI2 cmake file

10 years agoFixed typo in OpenNI2 cmake file
Fco. Javier Delgado del Hoyo [Tue, 29 Jul 2014 09:10:58 +0000 (11:10 +0200)]
Fixed typo in OpenNI2 cmake file

10 years agoMerge pull request #2987 from anishp:master
Vadim Pisarevsky [Mon, 28 Jul 2014 21:15:39 +0000 (21:15 +0000)]
Merge pull request #2987 from anishp:master

10 years agoMerge pull request #3008 from jet47:fix-cudacodec-dependecies
Vadim Pisarevsky [Mon, 28 Jul 2014 21:13:59 +0000 (21:13 +0000)]
Merge pull request #3008 from jet47:fix-cudacodec-dependecies

10 years agotest
siddharth [Mon, 14 Jul 2014 18:27:14 +0000 (23:57 +0530)]
test

10 years agoFixed mixed cloning bug
siddharth [Thu, 29 May 2014 04:47:39 +0000 (10:17 +0530)]
Fixed mixed cloning bug

10 years agoremoved build error
siddharth [Fri, 11 Apr 2014 23:04:41 +0000 (04:34 +0530)]
removed build error

Whitespaces removed

10 years agochanged demo tutorial path
siddharth [Fri, 11 Apr 2014 05:35:52 +0000 (11:05 +0530)]
changed demo tutorial path

10 years agorecursive filter output corrected
siddharth [Fri, 11 Apr 2014 05:22:34 +0000 (10:52 +0530)]
recursive filter output corrected

10 years agoUpdated Documentation
siddharth [Fri, 11 Apr 2014 05:19:35 +0000 (10:49 +0530)]
Updated Documentation

10 years agoMerge pull request #3010 from vpisarev:ocl_disable_some_norms2
Vadim Pisarevsky [Mon, 28 Jul 2014 17:24:42 +0000 (17:24 +0000)]
Merge pull request #3010 from vpisarev:ocl_disable_some_norms2

10 years agoMerge pull request #2989 from smvv:gstreamer_capture_init
Vadim Pisarevsky [Mon, 28 Jul 2014 16:00:33 +0000 (16:00 +0000)]
Merge pull request #2989 from smvv:gstreamer_capture_init

10 years agoMerge pull request #2996 from akarsakov:ocl_dft_new_concept
Vadim Pisarevsky [Mon, 28 Jul 2014 15:59:59 +0000 (15:59 +0000)]
Merge pull request #2996 from akarsakov:ocl_dft_new_concept

10 years agoMerge pull request #2998 from ernest-galbrun:cuda_concurrency
Vadim Pisarevsky [Mon, 28 Jul 2014 15:59:43 +0000 (15:59 +0000)]
Merge pull request #2998 from ernest-galbrun:cuda_concurrency

10 years agodisabled ocl_minmaxloc on 32-bit data completely
Vadim Pisarevsky [Mon, 28 Jul 2014 15:35:06 +0000 (19:35 +0400)]
disabled ocl_minmaxloc on 32-bit data completely

10 years agodisabled some more stuff
Vadim Pisarevsky [Mon, 28 Jul 2014 15:32:06 +0000 (19:32 +0400)]
disabled some more stuff

10 years agofixed compile warning with GCC
Vadim Pisarevsky [Mon, 28 Jul 2014 15:23:46 +0000 (19:23 +0400)]
fixed compile warning with GCC

10 years agofixed doc builder warnings
Vadim Pisarevsky [Mon, 28 Jul 2014 13:18:28 +0000 (17:18 +0400)]
fixed doc builder warnings

10 years agotrying to make OpenCL builder green
Vadim Pisarevsky [Mon, 28 Jul 2014 13:16:02 +0000 (17:16 +0400)]
trying to make OpenCL builder green