Vadim Pisarevsky [Thu, 7 Aug 2014 06:38:37 +0000 (06:38 +0000)]
Merge pull request #3047 from prattmic:python2and3
Vadim Pisarevsky [Thu, 7 Aug 2014 06:34:31 +0000 (06:34 +0000)]
Merge pull request #3054 from zillatrooper:master
arc [Thu, 7 Aug 2014 05:01:11 +0000 (01:01 -0400)]
Merge branch 'master' into python2and3
Michael Pratt [Thu, 7 Aug 2014 04:51:48 +0000 (00:51 -0400)]
Support Python 2 and 3 in test script
Add Python 3 support to the Python test.py script.
The print function is used in place of the print statement.
The urlopen function has been moved to urllib.request in Python 3, so
attempt to import it from either location.
TestCase.assert_() has been deprecated in place of
TestCase.assertTrue().
The tests all pass in both Python 2 and 3.
Michael Pratt [Thu, 7 Aug 2014 04:21:42 +0000 (00:21 -0400)]
Build Python 3 bindings in subdirectory
Build the Python 3 cv2 module in lib/python3/, to avoid potential naming
conflicts with the Python 2 bindings.
The Python 2 bindings are placed directly in lib/, where they are
required for the Buildbot to successfully execute the Python tests.
Michael Pratt [Thu, 7 Aug 2014 04:16:49 +0000 (00:16 -0400)]
Add opencv_matlab to Python ignored modules
Requested by @vpisarev in #3047.
Vadim Pisarevsky [Wed, 6 Aug 2014 20:21:05 +0000 (20:21 +0000)]
Merge pull request #3037 from PhilLab:pnpPatch
Björn Wöldecke [Wed, 6 Aug 2014 17:02:48 +0000 (19:02 +0200)]
fix misinterpretation of empty window name
The documentation states, that a NULL or an empty window name can be used
to refer to the control panel. But the string parameters of the C++ frontend
methods cannot be NULL and converting an empty string to a const char* by
c_str() doesn't produce a NULL pointer, but an empty string. Unfortunately,
the const char* pointer is just passed on to the standard C functions in
the QT backend, which doesn't check for the empty string case.
There are two places where the empty string check could have been introduced:
inside the frontend or inside the backend. As long as the documentation only
mentions this as a special case for the QT backend, the best place seems to
be there.
Vadim Pisarevsky [Wed, 6 Aug 2014 14:52:52 +0000 (14:52 +0000)]
Merge pull request #3039 from alalek:ocv_world
Vadim Pisarevsky [Wed, 6 Aug 2014 11:26:07 +0000 (11:26 +0000)]
Merge pull request #3013 from ElenaGvozdeva:ocl_matchTemplate
Vadim Pisarevsky [Wed, 6 Aug 2014 09:22:38 +0000 (09:22 +0000)]
Merge pull request #3041 from adrians:optimize_split
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.
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.
Michael Pratt [Wed, 6 Aug 2014 05:45:07 +0000 (01:45 -0400)]
Merge branch 'master' into python2and3
Alexander Alekhin [Tue, 5 Aug 2014 16:37:18 +0000 (20:37 +0400)]
make distrib with world (shared libs)
Alexander Alekhin [Fri, 1 Aug 2014 14:11:20 +0000 (18:11 +0400)]
world fix
Alexander Alekhin [Tue, 5 Aug 2014 14:52:22 +0000 (14:52 +0000)]
Merge pull request #3045 from vbystricky:ocl_MeanStdDevFix
Alexander Alekhin [Tue, 5 Aug 2014 14:17:06 +0000 (14:17 +0000)]
Merge pull request #3043 from vbystricky:ocl_ConvertToAccurTestFix
Alexander Alekhin [Tue, 5 Aug 2014 14:16:16 +0000 (14:16 +0000)]
Merge pull request #3035 from ElenaGvozdeva:ocl_test_fix
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
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
Elena Gvozdeva [Tue, 5 Aug 2014 07:55:18 +0000 (11:55 +0400)]
fixed ocl_integral
Elena Gvozdeva [Mon, 4 Aug 2014 10:15:21 +0000 (14:15 +0400)]
fixed test for CvtColor RGB -> Luv
Elena Gvozdeva [Mon, 4 Aug 2014 07:28:48 +0000 (11:28 +0400)]
fixed ocl tests for BlendLinear, BoxFilter, Integral
Adrian Stratulat [Sat, 19 Oct 2013 17:07:08 +0000 (17:07 +0000)]
Vectorize split & merge for NEON
Vadim Pisarevsky [Mon, 4 Aug 2014 16:43:00 +0000 (16:43 +0000)]
Merge pull request #2879 from alalek:ocl_runtime_flags
Vadim Pisarevsky [Mon, 4 Aug 2014 14:54:12 +0000 (14:54 +0000)]
Merge pull request #3036 from vbystricky:ocl_NormAccurTestFix
Vadim Pisarevsky [Mon, 4 Aug 2014 14:51:37 +0000 (14:51 +0000)]
Merge pull request #3032 from vpisarev:refactor_ml2
unknown [Mon, 4 Aug 2014 12:12:48 +0000 (14:12 +0200)]
Double precision for solvePnPRansac()
vbystricky [Mon, 4 Aug 2014 11:12:36 +0000 (15:12 +0400)]
Prevent generating test case with mask filled 0 only
Vadim Pisarevsky [Mon, 4 Aug 2014 10:22:31 +0000 (14:22 +0400)]
fixed more compile warnings on Windows
Vadim Pisarevsky [Mon, 4 Aug 2014 09:38:34 +0000 (09:38 +0000)]
Merge pull request #3034 from jet47:fix-compilation
Vladislav Vinogradov [Mon, 4 Aug 2014 08:13:33 +0000 (12:13 +0400)]
fix test_opencv_imgproc compilation
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
Alexander Alekhin [Mon, 4 Aug 2014 08:09:38 +0000 (08:09 +0000)]
Merge pull request #3030 from vbystricky:ocl_DotReduceAccurTestFix
Vadim Pisarevsky [Sun, 3 Aug 2014 21:16:45 +0000 (01:16 +0400)]
hopefully fixed test failure on Linux
Vadim Pisarevsky [Sun, 3 Aug 2014 17:21:11 +0000 (21:21 +0400)]
continuing to debug boost and fix MSVC compile errors
Vadim Pisarevsky [Sun, 3 Aug 2014 09:15:43 +0000 (13:15 +0400)]
fixed the condition
Vadim Pisarevsky [Sun, 3 Aug 2014 09:08:03 +0000 (13:08 +0400)]
more fixes and more debugging code
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
Vadim Pisarevsky [Sun, 3 Aug 2014 00:28:31 +0000 (04:28 +0400)]
temporarily 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.
Vadim Pisarevsky [Sat, 2 Aug 2014 23:08:25 +0000 (03:08 +0400)]
removed many extra whitespaces; fixed 1 warning
Vadim Pisarevsky [Sat, 2 Aug 2014 22:34:47 +0000 (02:34 +0400)]
fixed building html docs
Vadim Pisarevsky [Sat, 2 Aug 2014 21:52:24 +0000 (21:52 +0000)]
Merge pull request #3027 from vbystricky:cvtColorLuv2RGB
Vadim Pisarevsky [Sat, 2 Aug 2014 21:41:30 +0000 (01:41 +0400)]
updated docs
Vadim Pisarevsky [Sat, 2 Aug 2014 21:41:09 +0000 (01:41 +0400)]
made everything compile and even run somehow
VBystricky [Sat, 2 Aug 2014 09:21:34 +0000 (13:21 +0400)]
Increase epsilon for OpenCL version UMatDot and ReduceAvg accurency tests
Alexander Alekhin [Fri, 1 Aug 2014 17:21:59 +0000 (17:21 +0000)]
Merge pull request #3011 from vbystricky:oclopt_morthosmall
Alexander Alekhin [Fri, 1 Aug 2014 17:15:53 +0000 (17:15 +0000)]
Merge pull request #3028 from vbystricky:ocl_MergeAccurTestFix
Alexander Alekhin [Fri, 1 Aug 2014 17:15:38 +0000 (17:15 +0000)]
Merge pull request #3029 from vbystricky:ocl_UMatOpAccurTestFix
VBystricky [Fri, 1 Aug 2014 15:45:11 +0000 (19:45 +0400)]
Change min-max to clamp
vbystricky [Fri, 1 Aug 2014 14:30:20 +0000 (18:30 +0400)]
Fix accurency test for OpenCL matrix operations
vbystricky [Fri, 1 Aug 2014 13:53:24 +0000 (17:53 +0400)]
Fix accurency test of OpenCL merge function.
Vadim Pisarevsky [Fri, 1 Aug 2014 13:08:20 +0000 (13:08 +0000)]
Merge pull request #2671 from syilma:HomographyDecomp
Vadim Pisarevsky [Fri, 1 Aug 2014 13:06:36 +0000 (13:06 +0000)]
Merge pull request #3018 from fradelg:master
vbystricky [Fri, 1 Aug 2014 10:18:35 +0000 (14:18 +0400)]
Fix Luv2RGB function
Vadim Pisarevsky [Fri, 1 Aug 2014 09:42:40 +0000 (09:42 +0000)]
Merge pull request #3024 from jet47:fix-cudabgsegm-compilation
Vadim Pisarevsky [Fri, 1 Aug 2014 09:13:32 +0000 (09:13 +0000)]
Merge pull request #2608 from Siddharthk:master
Alexander Alekhin [Fri, 1 Aug 2014 08:57:37 +0000 (08:57 +0000)]
Merge pull request #3023 from vbystricky:ocl_minMaxLoc
Fco. Javier Delgado del Hoyo [Fri, 1 Aug 2014 07:28:19 +0000 (09:28 +0200)]
Removed OpticalFlowBM test from cudaoptflow module
Vadim Pisarevsky [Thu, 31 Jul 2014 18:20:07 +0000 (18:20 +0000)]
Merge pull request #3009 from vpisarev:ios_experiments
Alexander Alekhin [Thu, 31 Jul 2014 15:43:18 +0000 (15:43 +0000)]
Merge pull request #3002 from vbystricky:oclopt_pyrdown
vbystricky [Thu, 31 Jul 2014 15:12:10 +0000 (19:12 +0400)]
Enable ocl version of minmaxloc with mask
vbystricky [Thu, 31 Jul 2014 13:29:06 +0000 (17:29 +0400)]
Fix error in OCL minmaxloc
Alexander Alekhin [Thu, 31 Jul 2014 13:56:44 +0000 (13:56 +0000)]
Merge pull request #3021 from ElenaGvozdeva:ocl_flip
Vladislav Vinogradov [Thu, 31 Jul 2014 13:55:59 +0000 (17:55 +0400)]
fix cudabgsegm module compilation
Elena Gvozdeva [Thu, 31 Jul 2014 11:21:52 +0000 (15:21 +0400)]
fixed ocl_flip for cn==3
Vadim Pisarevsky [Thu, 31 Jul 2014 12:54:13 +0000 (12:54 +0000)]
Merge pull request #3020 from vpisarev:ocl_disable_more_funcs
Vadim Pisarevsky [Thu, 31 Jul 2014 10:24:21 +0000 (14:24 +0400)]
trying to make the tests pass
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
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.
Fco. Javier Delgado del Hoyo [Thu, 31 Jul 2014 07:21:44 +0000 (09:21 +0200)]
Removed cvCalcOpticalFlowBM from cudaoptflow test
Fco. Javier Delgado del Hoyo [Thu, 31 Jul 2014 07:08:29 +0000 (09:08 +0200)]
Removed cvCalcOpticalFlowBM from performance test
Michael Pratt [Thu, 31 Jul 2014 05:11:30 +0000 (01:11 -0400)]
Merge branch 'master' into python2and3
Samson Yilma [Thu, 31 Jul 2014 00:36:41 +0000 (20:36 -0400)]
Merge remote-tracking branch 'upstream/master' into HomographyDecomp
Samson Yilma [Wed, 30 Jul 2014 23:32:37 +0000 (19:32 -0400)]
added comment.
Samson Yilma [Wed, 30 Jul 2014 22:53:33 +0000 (18:53 -0400)]
updated documentation for decomposeHomography
Vadim Pisarevsky [Wed, 30 Jul 2014 18:53:46 +0000 (22:53 +0400)]
fixed compilation of some samples; fixed ANN_MLP::predict
Vadim Pisarevsky [Wed, 30 Jul 2014 15:55:02 +0000 (15:55 +0000)]
Merge pull request #2983 from wnoise:shrink-global-cuda-usage
Vadim Pisarevsky [Wed, 30 Jul 2014 15:12:11 +0000 (19:12 +0400)]
put IPP ReduceSum_32f back
Vadim Pisarevsky [Wed, 30 Jul 2014 15:03:47 +0000 (15:03 +0000)]
Merge pull request #3017 from f-morozov:akaze
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
f-morozov [Wed, 30 Jul 2014 14:02:08 +0000 (18:02 +0400)]
AKAZE fixes, tests and tutorial
Vadim Pisarevsky [Wed, 30 Jul 2014 12:48:41 +0000 (12:48 +0000)]
Merge pull request #2992 from snikulov:upmerge_jpeg_tweak
Vadim Pisarevsky [Wed, 30 Jul 2014 12:11:08 +0000 (16:11 +0400)]
fixed python bindings generation
Elena Gvozdeva [Wed, 30 Jul 2014 10:28:02 +0000 (14:28 +0400)]
use std::min,max
vbystricky [Wed, 30 Jul 2014 07:56:28 +0000 (11:56 +0400)]
Fix some problems
Fco. Javier Delgado del Hoyo [Wed, 30 Jul 2014 07:00:23 +0000 (09:00 +0200)]
Removed opencv_legacy dependency from cudaoptflow
vbystricky [Mon, 28 Jul 2014 11:48:02 +0000 (15:48 +0400)]
Optimize OpenCL version of morfology and box filters for small filter kernels
Sergei Nikulov [Tue, 29 Jul 2014 20:03:41 +0000 (00:03 +0400)]
#2992: update after review
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
Vadim Pisarevsky [Tue, 29 Jul 2014 17:22:30 +0000 (17:22 +0000)]
Merge pull request #2940 from davembradley:master
Vadim Pisarevsky [Tue, 29 Jul 2014 16:58:32 +0000 (16:58 +0000)]
Merge pull request #2991 from kovand11:calibrateDebevecFix
Andrey Pavlenko [Tue, 29 Jul 2014 15:29:35 +0000 (15:29 +0000)]
Merge pull request #3012 from vpisarev:clean_objdetect
Vadim Pisarevsky [Tue, 29 Jul 2014 14:10:18 +0000 (18:10 +0400)]
eliminated some unnecessary instructions
Vadim Pisarevsky [Tue, 29 Jul 2014 13:50:35 +0000 (13:50 +0000)]
Merge pull request #3016 from fradelg:master
Fco. Javier Delgado del Hoyo [Tue, 29 Jul 2014 09:13:00 +0000 (11:13 +0200)]
Another typo in comment inside 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
Elena Gvozdeva [Tue, 29 Jul 2014 08:07:21 +0000 (12:07 +0400)]
added dft for all platforms