Elena Gvozdeva [Tue, 12 Aug 2014 06:26:05 +0000 (10:26 +0400)]
fixed test for ocl PlaneWarperTest
Vadim Pisarevsky [Mon, 11 Aug 2014 16:41:30 +0000 (16:41 +0000)]
Merge pull request #3077 from kenlck:master
Vadim Pisarevsky [Mon, 11 Aug 2014 16:08:40 +0000 (16:08 +0000)]
Merge pull request #3071 from mshabunin:stitch-fix
Alexander Alekhin [Mon, 11 Aug 2014 15:02:53 +0000 (15:02 +0000)]
Merge pull request #3075 from akarsakov:ipp_imgproc_fix
Alexander Alekhin [Mon, 11 Aug 2014 15:01:25 +0000 (15:01 +0000)]
Merge pull request #3074 from ElenaGvozdeva:ocl_lut
Vadim Pisarevsky [Mon, 11 Aug 2014 14:04:38 +0000 (14:04 +0000)]
Merge pull request #3072 from nickdademo:pvapi_decimation_binning
Alexander Alekhin [Mon, 11 Aug 2014 13:20:10 +0000 (13:20 +0000)]
Merge pull request #3063 from akarsakov:ocl_warps_check
Low Chin Kian [Mon, 11 Aug 2014 13:08:37 +0000 (21:08 +0800)]
Allow full range IPv4 support, up to 255.255.255.255
Signed-off-by: Low Chin Kian <kenlck1990@gmail.com>
Elena Gvozdeva [Mon, 11 Aug 2014 12:21:55 +0000 (16:21 +0400)]
fix for ocl_lut
Alexander Karsakov [Mon, 11 Aug 2014 11:46:27 +0000 (15:46 +0400)]
Disabled some IPP calls of cvtColor since it breaks OCL accuracy tests
with test_loop_times=30
Alexander Karsakov [Mon, 11 Aug 2014 11:40:44 +0000 (15:40 +0400)]
Disabled ippiConvert_32f16s_C1R since it breaks OCL accuracy tests of remap with test_loop_times=30.
Alexander Karsakov [Mon, 11 Aug 2014 11:37:05 +0000 (15:37 +0400)]
Enabled IPPMorphReplicate in case BORDER_CONSTANT only for 3x3 kernels.
Nick D'Ademo [Mon, 11 Aug 2014 11:30:36 +0000 (13:30 +0200)]
Added get and set for additional PVAPI properties: DecimationHorizontal, DecimationVertical, BinningX, BinningY
mshabunin [Mon, 11 Aug 2014 10:50:08 +0000 (14:50 +0400)]
Merge remote-tracking branch 'master' into stitch-fix
* 'master' of github.com:itseez/opencv: (82 commits)
moved part of video to contrib/{outflow, bgsegm}; moved matlab to contrib
added some basic functionality needed by the new face module (moved from the old "contrib")
moved to the new opencv_contrib/face module
fixed various warnings and obvious errors reported by clang compiler and the coverity tool.
Fixed review comment from Vadim Pisarevsky
modified farneback sample to use T-API
ECC patch by the author (G. Evangelidis); fixed some OCL Farneback optical flow test failures on Mac
small fix for GaussianBlur ocl test
fix binary package build
small fix for ocl_resize
fix IOS framework
fixed test ocl_MatchTemplate for sparse matrix
Fixed typos
fixing error, wrong template method param.
fixing Mac build
some formal changes (generally adding constness)
Fixed choice of kercn and rowsPerWI for non-Intel device.
fixed nDiffs for CalcBackProject
fixed tests for ocl_filter2d, ocl_matchTemplate, ocl_histogram.cpp
Fixed issue: Mat::copyTo(UMat) if device copy is obsolete. Added test.
...
Conflicts:
modules/core/include/opencv2/core/mat.inl.hpp
Vadim Pisarevsky [Mon, 11 Aug 2014 10:27:30 +0000 (10:27 +0000)]
Merge pull request #3066 from vpisarev:minor_fixes
Vadim Pisarevsky [Mon, 11 Aug 2014 08:47:59 +0000 (08:47 +0000)]
Merge pull request #3069 from vpisarev:refactor_video
Vadim Pisarevsky [Mon, 11 Aug 2014 06:41:47 +0000 (06:41 +0000)]
Merge pull request #3061 from ElenaGvozdeva:ocl_resize
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 19:24:16 +0000 (23:24 +0400)]
moved part of video to contrib/{outflow, bgsegm}; moved matlab to contrib
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 18:45:07 +0000 (22:45 +0400)]
modified farneback sample to use T-API
Vadim Pisarevsky [Fri, 8 Aug 2014 18:33:40 +0000 (22:33 +0400)]
ECC patch by the author (G. Evangelidis); fixed some OCL Farneback optical flow test failures on Mac
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 Karsakov [Fri, 8 Aug 2014 13:14:38 +0000 (17:14 +0400)]
Changed check condition in tests for warpAffine and warpPerspective
Maksim Shabunin [Fri, 8 Aug 2014 12:59:24 +0000 (16:59 +0400)]
Revert "Avoid obtaining several identical dimensions between two LSH sub-vectors by choosing orthogonal sub-vectors."
This reverts commit
e85bacff7b676a7789bea6501e694cac299b21be.
Maksim Shabunin [Fri, 8 Aug 2014 12:59:13 +0000 (16:59 +0400)]
Revert "Fix a heap issue with static on Windows"
This reverts commit
8e93c19de311a76704028b0195abfe04cfad900d.
Maksim Shabunin [Fri, 8 Aug 2014 12:58:35 +0000 (16:58 +0400)]
Revert "Allows to choose orthogonal sub-vectors for LSH without using a static table among LshTable instances"
This reverts commit
e63d7de87c3565555e4a73220a465ed39488160d.
Maksim Shabunin [Fri, 8 Aug 2014 12:55:10 +0000 (16:55 +0400)]
Revert "Fix local variable shadowing"
This reverts commit
2f8b5731dabb3162ca62a0e1901bb13f0ed83e4c.
Elena Gvozdeva [Fri, 8 Aug 2014 07:09:10 +0000 (11:09 +0400)]
small fix for ocl_resize
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