profile/ivi/opencv.git
10 years agoMinimal image size is set to 5*5 for OCL path of fastNlMeansDenoising and fastNlMeans...
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.

10 years agoMerge pull request #3097 from mshabunin:gdal-support
Vadim Pisarevsky [Wed, 13 Aug 2014 19:26:10 +0000 (19:26 +0000)]
Merge pull request #3097 from mshabunin:gdal-support

10 years agoMerge pull request #3094 from Adil-Ibragimov:minor_fixes_in_Mat-data
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

10 years agoMerge pull request #3089 from Adil-Ibragimov:fix_cuda_constness
Vadim Pisarevsky [Wed, 13 Aug 2014 18:09:42 +0000 (18:09 +0000)]
Merge pull request #3089 from Adil-Ibragimov:fix_cuda_constness

10 years agoMerge with master and fix conflicts
mshabunin [Wed, 13 Aug 2014 14:24:11 +0000 (18:24 +0400)]
Merge with master and fix conflicts

10 years agoMerge pull request #3095 from vpisarev:restore_ocl_div_mul_and_repeat
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

10 years agofix for gcc
Adil Ibragimov [Wed, 13 Aug 2014 12:34:18 +0000 (16:34 +0400)]
fix for gcc

10 years agonow the tests pass with loop_times==30
Vadim Pisarevsky [Wed, 13 Aug 2014 12:32:01 +0000 (16:32 +0400)]
now the tests pass with loop_times==30

10 years agoSeveral type of formal refactoring:
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

10 years agoMerge pull request #3085 from nickdademo:pvapi_fix_decimation_enum
Vadim Pisarevsky [Wed, 13 Aug 2014 10:51:46 +0000 (10:51 +0000)]
Merge pull request #3085 from nickdademo:pvapi_fix_decimation_enum

10 years agoMerge pull request #3083 from akarsakov:ocl_transpose_check_locmem
Vadim Pisarevsky [Wed, 13 Aug 2014 10:50:51 +0000 (10:50 +0000)]
Merge pull request #3083 from akarsakov:ocl_transpose_check_locmem

10 years agoMerge pull request #3081 from akarsakov:small_fixes
Vadim Pisarevsky [Wed, 13 Aug 2014 10:50:33 +0000 (10:50 +0000)]
Merge pull request #3081 from akarsakov:small_fixes

10 years agodatastart must be non-const in CUDA.
Adil Ibragimov [Wed, 13 Aug 2014 07:11:33 +0000 (11:11 +0400)]
datastart must be non-const in CUDA.

10 years agoMerge pull request #3080 from ElenaGvozdeva:ocl_stich
Alexander Alekhin [Tue, 12 Aug 2014 16:52:40 +0000 (16:52 +0000)]
Merge pull request #3080 from ElenaGvozdeva:ocl_stich

10 years agoSet minimum matrix size for AmdBlas::gemm to 20 since it works incorrect for small...
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

10 years agoMerge pull request #3082 from ElenaGvozdeva:ocl_morphSmall
Vadim Pisarevsky [Tue, 12 Aug 2014 13:56:59 +0000 (13:56 +0000)]
Merge pull request #3082 from ElenaGvozdeva:ocl_morphSmall

10 years agoMerge pull request #3078 from vpisarev:refactor_features2d_take3
Vadim Pisarevsky [Tue, 12 Aug 2014 13:56:17 +0000 (13:56 +0000)]
Merge pull request #3078 from vpisarev:refactor_features2d_take3

10 years agoChange decimation enum values so they can be used in resolution calculations.
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.

10 years agoDisabled ippiFilterBoxBorder_* in case maskSize equal roiSize for any dimension
Alexander Karsakov [Tue, 12 Aug 2014 12:38:11 +0000 (16:38 +0400)]
Disabled ippiFilterBoxBorder_* in case maskSize equal roiSize for any dimension

10 years agofixed test for ocl PlaneWarperTest
Elena Gvozdeva [Tue, 12 Aug 2014 06:26:05 +0000 (10:26 +0400)]
fixed test for ocl PlaneWarperTest

10 years agoAdded check required local memory size for non-inplace transpose kernel
Alexander Karsakov [Tue, 12 Aug 2014 11:40:47 +0000 (15:40 +0400)]
Added check required local memory size for non-inplace transpose kernel

10 years agoMerge pull request #3033 from nathanjackson:clahe_datatypes
Vadim Pisarevsky [Tue, 12 Aug 2014 10:45:28 +0000 (10:45 +0000)]
Merge pull request #3033 from nathanjackson:clahe_datatypes

10 years agoremoved some more trailing whitespaces
Vadim Pisarevsky [Tue, 12 Aug 2014 10:33:18 +0000 (14:33 +0400)]
removed some more trailing whitespaces

10 years agoAdded ROUNDING_EPS for identical rounding after dividing on different platforms
Alexander Karsakov [Tue, 12 Aug 2014 08:06:37 +0000 (12:06 +0400)]
Added ROUNDING_EPS for identical rounding after dividing on different platforms

10 years agoMerge pull request #3073 from vbystricky:ocl_fixMinMaxLoc
Alexander Alekhin [Tue, 12 Aug 2014 10:21:41 +0000 (10:21 +0000)]
Merge pull request #3073 from vbystricky:ocl_fixMinMaxLoc

10 years agofixed Erode and Dilate in case of kernel = Mat()
Elena Gvozdeva [Tue, 12 Aug 2014 08:19:13 +0000 (12:19 +0400)]
fixed Erode and Dilate in case of kernel = Mat()

10 years agoRemove mul24, for CV8UC3 3840x2160 it generates implementation specific result
vbystricky [Tue, 12 Aug 2014 07:25:23 +0000 (11:25 +0400)]
Remove mul24, for CV8UC3 3840x2160 it generates implementation specific result

10 years agoIncreased epsilon for passing test with IPPICV
Alexander Karsakov [Tue, 12 Aug 2014 06:42:42 +0000 (10:42 +0400)]
Increased epsilon for passing test with IPPICV

10 years agofixed more doc builder warnings
Vadim Pisarevsky [Tue, 12 Aug 2014 06:40:23 +0000 (10:40 +0400)]
fixed more doc builder warnings

10 years agoFixed warning with "uninitialized local variable"
Alexander Karsakov [Tue, 12 Aug 2014 06:35:15 +0000 (10:35 +0400)]
Fixed warning with "uninitialized local variable"

10 years agoCPU (non-OpenCL) CLAHE now supports CV_16UC1.
Nathan Jackson [Mon, 4 Aug 2014 20:11:21 +0000 (16:11 -0400)]
CPU (non-OpenCL) CLAHE now supports CV_16UC1.

10 years agoremoved the stuff that's now in xfeatures2d; temporarily added dummy definition of...
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)

10 years agoremoved the stuff that's now in xfeatures2d; temporarily added dummy definition of...
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)

10 years agofixed doc builder complains and the test failures
Vadim Pisarevsky [Mon, 11 Aug 2014 20:03:40 +0000 (00:03 +0400)]
fixed doc builder complains and the test failures

10 years agomoved nonfree and a part of features2d to opencv_contrib/xfeatures2d
Vadim Pisarevsky [Mon, 11 Aug 2014 19:26:39 +0000 (23:26 +0400)]
moved nonfree and a part of features2d to opencv_contrib/xfeatures2d

10 years agoMerge pull request #3077 from kenlck:master
Vadim Pisarevsky [Mon, 11 Aug 2014 16:41:30 +0000 (16:41 +0000)]
Merge pull request #3077 from kenlck:master

10 years agoMerge pull request #3071 from mshabunin:stitch-fix
Vadim Pisarevsky [Mon, 11 Aug 2014 16:08:40 +0000 (16:08 +0000)]
Merge pull request #3071 from mshabunin:stitch-fix

10 years agoMerge pull request #3075 from akarsakov:ipp_imgproc_fix
Alexander Alekhin [Mon, 11 Aug 2014 15:02:53 +0000 (15:02 +0000)]
Merge pull request #3075 from akarsakov:ipp_imgproc_fix

10 years agoMerge pull request #3074 from ElenaGvozdeva:ocl_lut
Alexander Alekhin [Mon, 11 Aug 2014 15:01:25 +0000 (15:01 +0000)]
Merge pull request #3074 from ElenaGvozdeva:ocl_lut

10 years agoMerge pull request #3072 from nickdademo:pvapi_decimation_binning
Vadim Pisarevsky [Mon, 11 Aug 2014 14:04:38 +0000 (14:04 +0000)]
Merge pull request #3072 from nickdademo:pvapi_decimation_binning

10 years agoMerge pull request #3063 from akarsakov:ocl_warps_check
Alexander Alekhin [Mon, 11 Aug 2014 13:20:10 +0000 (13:20 +0000)]
Merge pull request #3063 from akarsakov:ocl_warps_check

10 years agoAllow full range IPv4 support, up to 255.255.255.255
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>
10 years agofix for ocl_lut
Elena Gvozdeva [Mon, 11 Aug 2014 12:21:55 +0000 (16:21 +0400)]
fix for ocl_lut

10 years agoRestore OpenCL branch for minmaxLoc on float data
vbystricky [Mon, 11 Aug 2014 11:57:29 +0000 (15:57 +0400)]
Restore OpenCL branch for minmaxLoc on float data

10 years agoDisabled some IPP calls of cvtColor since it breaks OCL accuracy tests
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

10 years agoDisabled ippiConvert_32f16s_C1R since it breaks OCL accuracy tests of remap with...
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.

10 years agoEnabled IPPMorphReplicate in case BORDER_CONSTANT only for 3x3 kernels.
Alexander Karsakov [Mon, 11 Aug 2014 11:37:05 +0000 (15:37 +0400)]
Enabled IPPMorphReplicate in case BORDER_CONSTANT only for 3x3 kernels.

10 years agoAdded get and set for additional PVAPI properties: DecimationHorizontal, DecimationVe...
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

10 years agoMerge remote-tracking branch 'master' into stitch-fix
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

10 years agoMerge pull request #3066 from vpisarev:minor_fixes
Vadim Pisarevsky [Mon, 11 Aug 2014 10:27:30 +0000 (10:27 +0000)]
Merge pull request #3066 from vpisarev:minor_fixes

10 years agoMerge pull request #3069 from vpisarev:refactor_video
Vadim Pisarevsky [Mon, 11 Aug 2014 08:47:59 +0000 (08:47 +0000)]
Merge pull request #3069 from vpisarev:refactor_video

10 years agoMerge pull request #3061 from ElenaGvozdeva:ocl_resize
Vadim Pisarevsky [Mon, 11 Aug 2014 06:41:47 +0000 (06:41 +0000)]
Merge pull request #3061 from ElenaGvozdeva:ocl_resize

10 years agoMerge pull request #3038 from yury-gorbachev:core_arithm_neon
Vadim Pisarevsky [Sun, 10 Aug 2014 20:20:04 +0000 (20:20 +0000)]
Merge pull request #3038 from yury-gorbachev:core_arithm_neon

10 years agomoved part of video to contrib/{outflow, bgsegm}; moved matlab to contrib
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

10 years agoMerge pull request #3067 from vpisarev:minor_fixes2
Vadim Pisarevsky [Sun, 10 Aug 2014 10:52:57 +0000 (10:52 +0000)]
Merge pull request #3067 from vpisarev:minor_fixes2

10 years agoMerge pull request #3068 from vpisarev:added_face_module
Vadim Pisarevsky [Sun, 10 Aug 2014 10:50:56 +0000 (10:50 +0000)]
Merge pull request #3068 from vpisarev:added_face_module

10 years agoadded some basic functionality needed by the new face module (moved from the old...
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")

10 years agomoved to the new opencv_contrib/face module
Vadim Pisarevsky [Sat, 9 Aug 2014 21:52:54 +0000 (01:52 +0400)]
moved to the new opencv_contrib/face module

10 years agofixed various warnings and obvious errors reported by clang compiler and the coverity...
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.

10 years agoFixed review comment from Vadim Pisarevsky
Yury Gorbachev [Sat, 9 Aug 2014 09:37:53 +0000 (13:37 +0400)]
Fixed review comment from Vadim Pisarevsky

10 years agoMerge pull request #2639 from kazuki-ma:cv_mat_foreach
Vadim Pisarevsky [Sat, 9 Aug 2014 08:25:04 +0000 (08:25 +0000)]
Merge pull request #2639 from kazuki-ma:cv_mat_foreach

10 years agomodified farneback sample to use T-API
Vadim Pisarevsky [Fri, 8 Aug 2014 18:45:07 +0000 (22:45 +0400)]
modified farneback sample to use T-API

10 years agoECC patch by the author (G. Evangelidis); fixed some OCL Farneback optical flow test...
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

10 years agoMerge pull request #3057 from Adil-Ibragimov:adding-constness
Vadim Pisarevsky [Fri, 8 Aug 2014 17:27:47 +0000 (17:27 +0000)]
Merge pull request #3057 from Adil-Ibragimov:adding-constness

10 years agoMerge pull request #3065 from alalek:fix_binary_package_build
Vadim Pisarevsky [Fri, 8 Aug 2014 17:19:03 +0000 (17:19 +0000)]
Merge pull request #3065 from alalek:fix_binary_package_build

10 years agoMerge pull request #3064 from ElenaGvozdeva:ocl_GaussianBlur
Vadim Pisarevsky [Fri, 8 Aug 2014 17:16:38 +0000 (17:16 +0000)]
Merge pull request #3064 from ElenaGvozdeva:ocl_GaussianBlur

10 years agoMerge pull request #3055 from akarsakov:copyto_UMat_fix
Vadim Pisarevsky [Fri, 8 Aug 2014 14:20:02 +0000 (14:20 +0000)]
Merge pull request #3055 from akarsakov:copyto_UMat_fix

10 years agoMerge pull request #3050 from ElenaGvozdeva:ocl_fixed_impg
Vadim Pisarevsky [Fri, 8 Aug 2014 14:06:49 +0000 (14:06 +0000)]
Merge pull request #3050 from ElenaGvozdeva:ocl_fixed_impg

10 years agoMerge pull request #3056 from akarsakov:ocl_setIdentity_fix
Vadim Pisarevsky [Fri, 8 Aug 2014 14:03:46 +0000 (14:03 +0000)]
Merge pull request #3056 from akarsakov:ocl_setIdentity_fix

10 years agoMerge pull request #3060 from akarsakov:ocl_dft_fix
Vadim Pisarevsky [Fri, 8 Aug 2014 14:03:26 +0000 (14:03 +0000)]
Merge pull request #3060 from akarsakov:ocl_dft_fix

10 years agoMerge pull request #3062 from alalek:fix_ios_framework
Vadim Pisarevsky [Fri, 8 Aug 2014 14:01:04 +0000 (14:01 +0000)]
Merge pull request #3062 from alalek:fix_ios_framework

10 years agosmall fix for GaussianBlur ocl test
Elena Gvozdeva [Fri, 8 Aug 2014 13:47:37 +0000 (17:47 +0400)]
small fix for GaussianBlur ocl test

10 years agofix binary package build
Alexander Alekhin [Fri, 8 Aug 2014 13:24:59 +0000 (17:24 +0400)]
fix binary package build

10 years agoChanged check condition in tests for warpAffine and warpPerspective
Alexander Karsakov [Fri, 8 Aug 2014 13:14:38 +0000 (17:14 +0400)]
Changed check condition in tests for warpAffine and warpPerspective

10 years agoRevert "Avoid obtaining several identical dimensions between two LSH sub-vectors...
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.

10 years agoRevert "Fix a heap issue with static on Windows"
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.

10 years agoRevert "Allows to choose orthogonal sub-vectors for LSH without using a static table...
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.

10 years agoRevert "Fix local variable shadowing"
Maksim Shabunin [Fri, 8 Aug 2014 12:55:10 +0000 (16:55 +0400)]
Revert "Fix local variable shadowing"

This reverts commit 2f8b5731dabb3162ca62a0e1901bb13f0ed83e4c.

10 years agosmall fix for ocl_resize
Elena Gvozdeva [Fri, 8 Aug 2014 07:09:10 +0000 (11:09 +0400)]
small fix for ocl_resize

10 years agofix IOS framework
Alexander Alekhin [Fri, 8 Aug 2014 11:57:54 +0000 (15:57 +0400)]
fix IOS framework

10 years agofixed test ocl_MatchTemplate for sparse matrix
Elena Gvozdeva [Thu, 7 Aug 2014 12:00:25 +0000 (16:00 +0400)]
fixed test ocl_MatchTemplate for sparse matrix

10 years agoFixed typos
Alexander Karsakov [Fri, 8 Aug 2014 09:11:35 +0000 (13:11 +0400)]
Fixed typos

10 years agoMerge pull request #3044 from akarsakov:fix_ocl_tests
Alexander Alekhin [Thu, 7 Aug 2014 20:14:17 +0000 (20:14 +0000)]
Merge pull request #3044 from akarsakov:fix_ocl_tests

10 years agofixing error, wrong template method param.
Adil Ibragimov [Thu, 7 Aug 2014 13:43:32 +0000 (17:43 +0400)]
fixing error, wrong template method param.

10 years agofixing Mac build
Adil Ibragimov [Thu, 7 Aug 2014 13:06:22 +0000 (17:06 +0400)]
fixing Mac build

10 years agosome formal changes (generally adding constness)
Adil Ibragimov [Thu, 7 Aug 2014 11:49:14 +0000 (15:49 +0400)]
some formal changes (generally adding constness)

10 years agoFixed choice of kercn and rowsPerWI for non-Intel device.
Alexander Karsakov [Thu, 7 Aug 2014 11:37:26 +0000 (15:37 +0400)]
Fixed choice of kercn and rowsPerWI for non-Intel device.

10 years agofixed nDiffs for CalcBackProject
Elena Gvozdeva [Wed, 6 Aug 2014 13:31:19 +0000 (17:31 +0400)]
fixed nDiffs for CalcBackProject

10 years agofixed tests for ocl_filter2d, ocl_matchTemplate, ocl_histogram.cpp
Elena Gvozdeva [Wed, 6 Aug 2014 12:14:48 +0000 (16:14 +0400)]
fixed tests for ocl_filter2d, ocl_matchTemplate, ocl_histogram.cpp

10 years agoFixed issue: Mat::copyTo(UMat) if device copy is obsolete. Added test.
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.

10 years agoFixed extrapolation in pyrDown
Alexander Karsakov [Wed, 6 Aug 2014 07:09:56 +0000 (11:09 +0400)]
Fixed extrapolation in pyrDown

10 years agoFixed calculate_histogram kernel
Alexander Karsakov [Tue, 5 Aug 2014 13:17:14 +0000 (17:17 +0400)]
Fixed calculate_histogram kernel

10 years agoFixed rounding in remap INTER_LINEAR mode
Alexander Karsakov [Tue, 5 Aug 2014 11:40:29 +0000 (15:40 +0400)]
Fixed rounding in remap INTER_LINEAR mode

10 years agoRevert optimization for warpAffine INTER_NEAREST mode
Alexander Karsakov [Mon, 4 Aug 2014 08:45:00 +0000 (12:45 +0400)]
Revert optimization for warpAffine INTER_NEAREST mode

10 years agoMerge pull request #3047 from prattmic:python2and3
Vadim Pisarevsky [Thu, 7 Aug 2014 06:38:37 +0000 (06:38 +0000)]
Merge pull request #3047 from prattmic:python2and3

10 years agoMerge pull request #3054 from zillatrooper:master
Vadim Pisarevsky [Thu, 7 Aug 2014 06:34:31 +0000 (06:34 +0000)]
Merge pull request #3054 from zillatrooper:master

10 years agoMerge branch 'master' into python2and3
arc [Thu, 7 Aug 2014 05:01:11 +0000 (01:01 -0400)]
Merge branch 'master' into python2and3

10 years agoSupport Python 2 and 3 in test script
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.

10 years agoBuild Python 3 bindings in subdirectory
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.

10 years agoAdd opencv_matlab to Python ignored modules
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.