Commit Graph

15745 Commits

Author SHA1 Message Date
Vadim Pisarevsky
257463719b removed optim module; moved its functionality to core and photo modules; moved drawing functions from core to imgproc. Removed FilterEngine etc. from public API 2014-08-14 12:50:07 +04:00
vbystricky
aab6f6c56f Set sync=true in ocl_minMaxIdx kernel call. For tests 2014-08-14 12:14:56 +04:00
Alexander Karsakov
75ede6e17c 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. 2014-08-14 12:14:33 +04:00
Alexander Karsakov
8760a344ec Fixed incorrect pointer conversion for in-place threshold 2014-08-14 11:02:55 +04:00
Vadim Pisarevsky
6f86c9f118 another mac-related fix, let's squeeze it in this PR too 2014-08-14 10:45:47 +04:00
Vadim Pisarevsky
5d8098a2c3 avoid compiler warnings 2014-08-14 10:06:10 +04:00
VBystricky
c5632d412e Change epsilon for NORM_INF_2args accuracy tests 2014-08-13 23:50:32 +04:00
Vadim Pisarevsky
a602185fb6 Merge pull request #3097 from mshabunin:gdal-support 2014-08-13 19:26:10 +00:00
Vadim Pisarevsky
5f590ebed0 Merge pull request #3094 from Adil-Ibragimov:minor_fixes_in_Mat-data 2014-08-13 18:28:51 +00:00
Vadim Pisarevsky
71ff228ad3 Merge pull request #3089 from Adil-Ibragimov:fix_cuda_constness 2014-08-13 18:09:42 +00:00
Vadim Pisarevsky
a37876ab95 fixed build of iOS framework another time; clang does not like the new NEON-optimized split/merge 2014-08-13 19:59:26 +04:00
jaco
b81dcbdf2a #pragma warning4127 fixation modified
Now use cleaner approach:

#pragma warning( push )
#pragma warning( disable: ThatWarning )
//code with ThatWarning here
#pragma warning( pop )
2014-08-13 17:59:16 +02:00
Vladislav Vinogradov
9786e0a760 fix cudabgsegm module compilation 2014-08-13 19:20:23 +04:00
vbystricky
1fe403f461 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
2014-08-13 18:33:01 +04:00
mshabunin
3ed89a8879 Merge with master and fix conflicts 2014-08-13 18:24:11 +04:00
Vladislav Vinogradov
8392296eda remove -fvisibility-inlines-hidden from CUDA compiler flags
it generates warning
2014-08-13 18:08:48 +04:00
Vladislav Vinogradov
f5d9359da8 use directory-based include_directories command if we build with CUDA 2014-08-13 18:08:08 +04:00
Vladislav Vinogradov
0825120f6a move CUDA compilation step from ocv_glob_module_sources to ocv_add_library 2014-08-13 18:07:31 +04:00
Vadim Pisarevsky
12c69ad490 Merge pull request #3095 from vpisarev:restore_ocl_div_mul_and_repeat 2014-08-13 13:56:19 +00:00
Adil Ibragimov
9ac06a9333 fix for gcc 2014-08-13 16:34:18 +04:00
Vadim Pisarevsky
d97f9fc477 now the tests pass with loop_times==30 2014-08-13 16:32:01 +04:00
Adil Ibragimov
8a4a1bb018 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
2014-08-13 15:21:35 +04:00
Vadim Pisarevsky
30111a786a Merge pull request #3085 from nickdademo:pvapi_fix_decimation_enum 2014-08-13 10:51:46 +00:00
Vadim Pisarevsky
3cd7941098 Merge pull request #3083 from akarsakov:ocl_transpose_check_locmem 2014-08-13 10:50:51 +00:00
Vadim Pisarevsky
01bd4961e3 Merge pull request #3081 from akarsakov:small_fixes 2014-08-13 10:50:33 +00:00
Alexander Karsakov
c3100eeb19 Fixed buffer initialization in reduce kernel. Enabled OCL version of reduce for SUM, MAX, MIN modes. 2014-08-13 12:03:06 +04:00
Adil Ibragimov
dfd0b297ce datastart must be non-const in CUDA. 2014-08-13 11:11:33 +04:00
Alexander Alekhin
28f3a44e33 Merge pull request #3080 from ElenaGvozdeva:ocl_stich 2014-08-12 16:52:41 +00:00
edgarriba
3c3d695d4d Perf test update 2014-08-12 18:29:43 +02:00
edgarriba
301ed34142 removed old headers 2014-08-12 17:36:23 +02:00
edgarriba
7da9800694 removed old headers 2014-08-12 17:22:35 +02:00
edgarriba
4a214c08e5 removed old code 2014-08-12 17:07:38 +02:00
edgarriba
12f8d8069d removed old code 2014-08-12 16:49:19 +02:00
edgarriba
1dec1645e5 Merge branch 'master' of https://github.com/Itseez/opencv 2014-08-12 16:45:22 +02:00
edgarriba
de2861e7a9 DLS performance modifications 2014-08-12 16:20:22 +02:00
edgarriba
d1f4f6f4b8 DLS performance modifications 2014-08-12 16:15:19 +02:00
Alexander Karsakov
713ddb89bd Set minimum matrix size for AmdBlas::gemm to 20 since it works incorrect for small sizes 2014-08-12 18:02:29 +04:00
Vadim Pisarevsky
c97c0be4f2 Merge pull request #3082 from ElenaGvozdeva:ocl_morphSmall 2014-08-12 13:56:59 +00:00
Vadim Pisarevsky
5505aa28ce Merge pull request #3078 from vpisarev:refactor_features2d_take3 2014-08-12 13:56:17 +00:00
jaco
58b3bc2d7e #pragma warning4127 fixed for cvstd.inl.hpp 2014-08-12 15:28:39 +02:00
Nick D'Ademo
91676de638 Change decimation enum values so they can be used in resolution calculations.
BUGFIX: Fixed bugged when setting PVAPI property CV_CAP_PROP_FRAME_HEIGHT.
2014-08-12 15:18:11 +02:00
Alexander Karsakov
b4d3b34acf Disabled ippiFilterBoxBorder_* in case maskSize equal roiSize for any dimension 2014-08-12 16:38:11 +04:00
Elena Gvozdeva
1c7ee88b84 fixed test for ocl PlaneWarperTest 2014-08-12 16:37:34 +04:00
Alexander Karsakov
3deea1c3ce Added check required local memory size for non-inplace transpose kernel 2014-08-12 16:26:08 +04:00
Vadim Pisarevsky
5119564579 Merge pull request #3033 from nathanjackson:clahe_datatypes 2014-08-12 10:45:29 +00:00
Vadim Pisarevsky
1629d50999 removed some more trailing whitespaces 2014-08-12 14:33:18 +04:00
Alexander Karsakov
5898dcae4a Added ROUNDING_EPS for identical rounding after dividing on different platforms 2014-08-12 14:28:48 +04:00
Alexander Alekhin
da806cc3e7 Merge pull request #3073 from vbystricky:ocl_fixMinMaxLoc 2014-08-12 10:21:41 +00:00
Elena Gvozdeva
8124d10526 fixed Erode and Dilate in case of kernel = Mat() 2014-08-12 12:19:13 +04:00
vbystricky
6fb282aa39 Remove mul24, for CV8UC3 3840x2160 it generates implementation specific result 2014-08-12 11:25:23 +04:00