Alexander Karsakov [Mon, 11 Aug 2014 11:37:05 +0000 (15:37 +0400)]
Enabled IPPMorphReplicate in case BORDER_CONSTANT only for 3x3 kernels.
Vadim Pisarevsky [Sun, 10 Aug 2014 20:20:04 +0000 (20:20 +0000)]
Merge pull request #3038 from yury-gorbachev:core_arithm_neon
Vadim Pisarevsky [Sun, 10 Aug 2014 10:52:57 +0000 (10:52 +0000)]
Merge pull request #3067 from vpisarev:minor_fixes2
Vadim Pisarevsky [Sun, 10 Aug 2014 10:50:56 +0000 (10:50 +0000)]
Merge pull request #3068 from vpisarev:added_face_module
Vadim Pisarevsky [Sat, 9 Aug 2014 21:54:16 +0000 (01:54 +0400)]
added some basic functionality needed by the new face module (moved from the old "contrib")
Vadim Pisarevsky [Sat, 9 Aug 2014 21:52:54 +0000 (01:52 +0400)]
moved to the new opencv_contrib/face module
Vadim Pisarevsky [Sat, 9 Aug 2014 20:10:05 +0000 (00:10 +0400)]
fixed various warnings and obvious errors reported by clang compiler and the coverity tool.
Yury Gorbachev [Sat, 9 Aug 2014 09:37:53 +0000 (13:37 +0400)]
Fixed review comment from Vadim Pisarevsky
Vadim Pisarevsky [Sat, 9 Aug 2014 08:25:04 +0000 (08:25 +0000)]
Merge pull request #2639 from kazuki-ma:cv_mat_foreach
Vadim Pisarevsky [Fri, 8 Aug 2014 17:27:47 +0000 (17:27 +0000)]
Merge pull request #3057 from Adil-Ibragimov:adding-constness
Vadim Pisarevsky [Fri, 8 Aug 2014 17:19:03 +0000 (17:19 +0000)]
Merge pull request #3065 from alalek:fix_binary_package_build
Vadim Pisarevsky [Fri, 8 Aug 2014 17:16:38 +0000 (17:16 +0000)]
Merge pull request #3064 from ElenaGvozdeva:ocl_GaussianBlur
Vadim Pisarevsky [Fri, 8 Aug 2014 14:20:02 +0000 (14:20 +0000)]
Merge pull request #3055 from akarsakov:copyto_UMat_fix
Vadim Pisarevsky [Fri, 8 Aug 2014 14:06:49 +0000 (14:06 +0000)]
Merge pull request #3050 from ElenaGvozdeva:ocl_fixed_impg
Vadim Pisarevsky [Fri, 8 Aug 2014 14:03:46 +0000 (14:03 +0000)]
Merge pull request #3056 from akarsakov:ocl_setIdentity_fix
Vadim Pisarevsky [Fri, 8 Aug 2014 14:03:26 +0000 (14:03 +0000)]
Merge pull request #3060 from akarsakov:ocl_dft_fix
Vadim Pisarevsky [Fri, 8 Aug 2014 14:01:04 +0000 (14:01 +0000)]
Merge pull request #3062 from alalek:fix_ios_framework
Elena Gvozdeva [Fri, 8 Aug 2014 13:47:37 +0000 (17:47 +0400)]
small fix for GaussianBlur ocl test
Alexander Alekhin [Fri, 8 Aug 2014 13:24:59 +0000 (17:24 +0400)]
fix binary package build
Alexander Alekhin [Fri, 8 Aug 2014 11:57:54 +0000 (15:57 +0400)]
fix IOS framework
Elena Gvozdeva [Thu, 7 Aug 2014 12:00:25 +0000 (16:00 +0400)]
fixed test ocl_MatchTemplate for sparse matrix
Alexander Karsakov [Fri, 8 Aug 2014 09:11:35 +0000 (13:11 +0400)]
Fixed typos
Alexander Alekhin [Thu, 7 Aug 2014 20:14:17 +0000 (20:14 +0000)]
Merge pull request #3044 from akarsakov:fix_ocl_tests
Adil Ibragimov [Thu, 7 Aug 2014 13:43:32 +0000 (17:43 +0400)]
fixing error, wrong template method param.
Adil Ibragimov [Thu, 7 Aug 2014 13:06:22 +0000 (17:06 +0400)]
fixing Mac build
Adil Ibragimov [Thu, 7 Aug 2014 11:49:14 +0000 (15:49 +0400)]
some formal changes (generally adding constness)
Alexander Karsakov [Thu, 7 Aug 2014 11:37:26 +0000 (15:37 +0400)]
Fixed choice of kercn and rowsPerWI for non-Intel device.
Elena Gvozdeva [Wed, 6 Aug 2014 13:31:19 +0000 (17:31 +0400)]
fixed nDiffs for CalcBackProject
Elena Gvozdeva [Wed, 6 Aug 2014 12:14:48 +0000 (16:14 +0400)]
fixed tests for ocl_filter2d, ocl_matchTemplate, ocl_histogram.cpp
Alexander Karsakov [Thu, 7 Aug 2014 08:31:50 +0000 (12:31 +0400)]
Fixed issue: Mat::copyTo(UMat) if device copy is obsolete. Added test.
Alexander Karsakov [Wed, 6 Aug 2014 07:09:56 +0000 (11:09 +0400)]
Fixed extrapolation in pyrDown
Alexander Karsakov [Tue, 5 Aug 2014 13:17:14 +0000 (17:17 +0400)]
Fixed calculate_histogram kernel
Alexander Karsakov [Tue, 5 Aug 2014 11:40:29 +0000 (15:40 +0400)]
Fixed rounding in remap INTER_LINEAR mode
Alexander Karsakov [Mon, 4 Aug 2014 08:45:00 +0000 (12:45 +0400)]
Revert optimization for warpAffine INTER_NEAREST mode
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
Yury Gorbachev [Mon, 4 Aug 2014 12:44:51 +0000 (16:44 +0400)]
ARM NEON accelerated implementation of cv::addWeighted, cv::inRange and cv::compare functions.
NOT verified on target platform, compilation passes with and without NEON.
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