Alexander Karsakov [Mon, 18 Aug 2014 14:19:51 +0000 (18:19 +0400)]
Changed twiddle buffer creation to use OCL buffer pool (if possible)
Vadim Pisarevsky [Sat, 16 Aug 2014 16:50:41 +0000 (16:50 +0000)]
Merge pull request #3086 from fpuja:pragma_warning4127_fixing
Vadim Pisarevsky [Sat, 16 Aug 2014 16:45:26 +0000 (16:45 +0000)]
Merge pull request #3114 from abidrahmank:PyBindTutorials
abidrahmank [Sat, 16 Aug 2014 11:10:18 +0000 (16:40 +0530)]
Python bindings tutorial
Vadim Pisarevsky [Fri, 15 Aug 2014 15:08:34 +0000 (15:08 +0000)]
Merge pull request #3111 from vpisarev:make_ximgproc_compile
Vadim Pisarevsky [Fri, 15 Aug 2014 14:00:41 +0000 (18:00 +0400)]
fix compile problems with contributed ximgproc/xphoto
Vadim Pisarevsky [Fri, 15 Aug 2014 05:44:54 +0000 (05:44 +0000)]
Merge pull request #3106 from LeszekSwirski:fix-gemm-buf-allocate
jaco [Thu, 14 Aug 2014 17:27:53 +0000 (19:27 +0200)]
#pragma warning4127 fixation modified 2
Roman Donchenko [Thu, 14 Aug 2014 15:19:19 +0000 (19:19 +0400)]
Merge tag '3.0.0-alpha'
OpenCV 3.0.0 Alpha
Roman Donchenko [Thu, 14 Aug 2014 15:17:29 +0000 (19:17 +0400)]
Set status to alpha
Leszek Swirski [Thu, 14 Aug 2014 14:05:30 +0000 (15:05 +0100)]
Fix reallocation of D buffer in gemm
Alexander Alekhin [Thu, 14 Aug 2014 14:34:40 +0000 (14:34 +0000)]
Merge pull request #3088 from vbystricky:ocl_enableNormEtc
vbystricky [Thu, 14 Aug 2014 13:39:41 +0000 (17:39 +0400)]
Disable OpenCL version of minMaxIdx with mask on AMD devices
Vadim Pisarevsky [Thu, 14 Aug 2014 13:39:01 +0000 (13:39 +0000)]
Merge pull request #3103 from vpisarev:core_imgproc_optim_rearrangements
Vadim Pisarevsky [Thu, 14 Aug 2014 11:42:14 +0000 (11:42 +0000)]
Merge pull request #3101 from akarsakov:ipp_thresh_fix
Vadim Pisarevsky [Thu, 14 Aug 2014 10:59:32 +0000 (10:59 +0000)]
Merge pull request #3102 from akarsakov:ocl_denoising_fix
Vadim Pisarevsky [Thu, 14 Aug 2014 10:53:02 +0000 (14:53 +0400)]
fixed trailing whitespaces
Vadim Pisarevsky [Thu, 14 Aug 2014 10:37:30 +0000 (14:37 +0400)]
trying to solve compile problems; temporarily disabled some tests for just added optimization algo's
Alexander Alekhin [Thu, 14 Aug 2014 10:05:49 +0000 (10:05 +0000)]
Merge pull request #3098 from jet47:fix-cuda-compilation
Vadim Pisarevsky [Thu, 14 Aug 2014 09:48:52 +0000 (13:48 +0400)]
fixing more compile problems with Java bindings etc
Vadim Pisarevsky [Thu, 14 Aug 2014 09:18:04 +0000 (13:18 +0400)]
trying to fix builds
Vadim Pisarevsky [Thu, 14 Aug 2014 08:52:18 +0000 (08:52 +0000)]
Merge pull request #3090 from akarsakov:ocl_reduce_fix
Vadim Pisarevsky [Thu, 14 Aug 2014 08:51:44 +0000 (08:51 +0000)]
Merge pull request #3100 from vpisarev:disabled_neon_split_merge_on_ios
Vadim Pisarevsky [Thu, 14 Aug 2014 08:50:07 +0000 (12:50 +0400)]
removed optim module; moved its functionality to core and photo modules; moved drawing functions from core to imgproc. Removed FilterEngine etc. from public API
vbystricky [Thu, 14 Aug 2014 08:14:56 +0000 (12:14 +0400)]
Set sync=true in ocl_minMaxIdx kernel call. For tests
Alexander Karsakov [Thu, 14 Aug 2014 08:14:33 +0000 (12:14 +0400)]
Minimal image size is set to 5*5 for OCL path of fastNlMeansDenoising and fastNlMeansDenoisingColored since it breaks tests with test_loop_times=30 and in general doesn't make sense for computation on GPU.
Alexander Karsakov [Thu, 14 Aug 2014 07:02:55 +0000 (11:02 +0400)]
Fixed incorrect pointer conversion for in-place threshold
Vadim Pisarevsky [Thu, 14 Aug 2014 06:45:47 +0000 (10:45 +0400)]
another mac-related fix, let's squeeze it in this PR too
Vadim Pisarevsky [Thu, 14 Aug 2014 06:06:10 +0000 (10:06 +0400)]
avoid compiler warnings
VBystricky [Wed, 13 Aug 2014 19:50:32 +0000 (23:50 +0400)]
Change epsilon for NORM_INF_2args accuracy tests
Vadim Pisarevsky [Wed, 13 Aug 2014 19:26:10 +0000 (19:26 +0000)]
Merge pull request #3097 from mshabunin:gdal-support
Vadim Pisarevsky [Wed, 13 Aug 2014 18:28:51 +0000 (18:28 +0000)]
Merge pull request #3094 from Adil-Ibragimov:minor_fixes_in_Mat-data
Vadim Pisarevsky [Wed, 13 Aug 2014 18:09:42 +0000 (18:09 +0000)]
Merge pull request #3089 from Adil-Ibragimov:fix_cuda_constness
Vadim Pisarevsky [Wed, 13 Aug 2014 15:59:26 +0000 (19:59 +0400)]
fixed build of iOS framework another time; clang does not like the new NEON-optimized split/merge
jaco [Wed, 13 Aug 2014 15:59:16 +0000 (17:59 +0200)]
#pragma warning4127 fixation modified
Now use cleaner approach:
#pragma warning( push )
#pragma warning( disable: ThatWarning )
//code with ThatWarning here
#pragma warning( pop )
Vladislav Vinogradov [Wed, 13 Aug 2014 15:20:23 +0000 (19:20 +0400)]
fix cudabgsegm module compilation
vbystricky [Wed, 13 Aug 2014 06:21:16 +0000 (10:21 +0400)]
Enable OpenCL version of norm and convertScaleAbs or 32F data
Fix error in minmaxloc.cl
Change test for convertScaleAbs
Fix minMaxIdx for _src2 align
Change epsilon on the tests
mshabunin [Wed, 13 Aug 2014 14:24:11 +0000 (18:24 +0400)]
Merge with master and fix conflicts
Vladislav Vinogradov [Wed, 13 Aug 2014 14:08:48 +0000 (18:08 +0400)]
remove -fvisibility-inlines-hidden from CUDA compiler flags
it generates warning
Vladislav Vinogradov [Wed, 13 Aug 2014 14:08:08 +0000 (18:08 +0400)]
use directory-based include_directories command if we build with CUDA
Vladislav Vinogradov [Wed, 13 Aug 2014 14:07:31 +0000 (18:07 +0400)]
move CUDA compilation step from ocv_glob_module_sources to ocv_add_library
Vadim Pisarevsky [Wed, 13 Aug 2014 13:56:19 +0000 (13:56 +0000)]
Merge pull request #3095 from vpisarev:restore_ocl_div_mul_and_repeat
Adil Ibragimov [Wed, 13 Aug 2014 12:34:18 +0000 (16:34 +0400)]
fix for gcc
Vadim Pisarevsky [Wed, 13 Aug 2014 12:32:01 +0000 (16:32 +0400)]
now the tests pass with loop_times==30
Adil Ibragimov [Wed, 13 Aug 2014 11:08:27 +0000 (15:08 +0400)]
Several type of formal refactoring:
1. someMatrix.data -> someMatrix.prt()
2. someMatrix.data + someMatrix.step * lineIndex -> someMatrix.ptr( lineIndex )
3. (SomeType*) someMatrix.data -> someMatrix.ptr<SomeType>()
4. someMatrix.data -> !someMatrix.empty() ( or !someMatrix.data -> someMatrix.empty() ) in logical expressions
Vadim Pisarevsky [Wed, 13 Aug 2014 10:51:46 +0000 (10:51 +0000)]
Merge pull request #3085 from nickdademo:pvapi_fix_decimation_enum
Vadim Pisarevsky [Wed, 13 Aug 2014 10:50:51 +0000 (10:50 +0000)]
Merge pull request #3083 from akarsakov:ocl_transpose_check_locmem
Vadim Pisarevsky [Wed, 13 Aug 2014 10:50:33 +0000 (10:50 +0000)]
Merge pull request #3081 from akarsakov:small_fixes
Alexander Karsakov [Wed, 13 Aug 2014 08:03:06 +0000 (12:03 +0400)]
Fixed buffer initialization in reduce kernel. Enabled OCL version of reduce for SUM, MAX, MIN modes.
Adil Ibragimov [Wed, 13 Aug 2014 07:11:33 +0000 (11:11 +0400)]
datastart must be non-const in CUDA.
Alexander Alekhin [Tue, 12 Aug 2014 16:52:40 +0000 (16:52 +0000)]
Merge pull request #3080 from ElenaGvozdeva:ocl_stich
Alexander Karsakov [Tue, 12 Aug 2014 14:02:29 +0000 (18:02 +0400)]
Set minimum matrix size for AmdBlas::gemm to 20 since it works incorrect for small sizes
Vadim Pisarevsky [Tue, 12 Aug 2014 13:56:59 +0000 (13:56 +0000)]
Merge pull request #3082 from ElenaGvozdeva:ocl_morphSmall
Vadim Pisarevsky [Tue, 12 Aug 2014 13:56:17 +0000 (13:56 +0000)]
Merge pull request #3078 from vpisarev:refactor_features2d_take3
jaco [Tue, 12 Aug 2014 13:28:39 +0000 (15:28 +0200)]
#pragma warning4127 fixed for cvstd.inl.hpp
Nick D'Ademo [Tue, 12 Aug 2014 13:18:11 +0000 (15:18 +0200)]
Change decimation enum values so they can be used in resolution calculations.
BUGFIX: Fixed bugged when setting PVAPI property CV_CAP_PROP_FRAME_HEIGHT.
Alexander Karsakov [Tue, 12 Aug 2014 12:38:11 +0000 (16:38 +0400)]
Disabled ippiFilterBoxBorder_* in case maskSize equal roiSize for any dimension
Elena Gvozdeva [Tue, 12 Aug 2014 06:26:05 +0000 (10:26 +0400)]
fixed test for ocl PlaneWarperTest
Alexander Karsakov [Tue, 12 Aug 2014 11:40:47 +0000 (15:40 +0400)]
Added check required local memory size for non-inplace transpose kernel
Vadim Pisarevsky [Tue, 12 Aug 2014 10:45:28 +0000 (10:45 +0000)]
Merge pull request #3033 from nathanjackson:clahe_datatypes
Vadim Pisarevsky [Tue, 12 Aug 2014 10:33:18 +0000 (14:33 +0400)]
removed some more trailing whitespaces
Alexander Karsakov [Tue, 12 Aug 2014 08:06:37 +0000 (12:06 +0400)]
Added ROUNDING_EPS for identical rounding after dividing on different platforms
Alexander Alekhin [Tue, 12 Aug 2014 10:21:41 +0000 (10:21 +0000)]
Merge pull request #3073 from vbystricky:ocl_fixMinMaxLoc
Elena Gvozdeva [Tue, 12 Aug 2014 08:19:13 +0000 (12:19 +0400)]
fixed Erode and Dilate in case of kernel = Mat()
vbystricky [Tue, 12 Aug 2014 07:25:23 +0000 (11:25 +0400)]
Remove mul24, for CV8UC3 3840x2160 it generates implementation specific result
Alexander Karsakov [Tue, 12 Aug 2014 06:42:42 +0000 (10:42 +0400)]
Increased epsilon for passing test with IPPICV
Vadim Pisarevsky [Tue, 12 Aug 2014 06:40:23 +0000 (10:40 +0400)]
fixed more doc builder warnings
Alexander Karsakov [Tue, 12 Aug 2014 06:35:15 +0000 (10:35 +0400)]
Fixed warning with "uninitialized local variable"
Nathan Jackson [Mon, 4 Aug 2014 20:11:21 +0000 (16:11 -0400)]
CPU (non-OpenCL) CLAHE now supports CV_16UC1.
Vadim Pisarevsky [Mon, 11 Aug 2014 20:30:06 +0000 (00:30 +0400)]
removed the stuff that's now in xfeatures2d; temporarily added dummy definition of SIFT to make doc builder pass (will remove it later)
Vadim Pisarevsky [Mon, 11 Aug 2014 20:29:56 +0000 (00:29 +0400)]
removed the stuff that's now in xfeatures2d; temporarily added dummy definition of SIFT to make doc builder pass (will remove it later)
Vadim Pisarevsky [Mon, 11 Aug 2014 20:03:40 +0000 (00:03 +0400)]
fixed doc builder complains and the test failures
Vadim Pisarevsky [Mon, 11 Aug 2014 19:26:39 +0000 (23:26 +0400)]
moved nonfree and a part of features2d to opencv_contrib/xfeatures2d
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
vbystricky [Mon, 11 Aug 2014 11:57:29 +0000 (15:57 +0400)]
Restore OpenCL branch for minmaxLoc on float data
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