Roman Donchenko
ddfd1854a7
Merge pull request #2151 from KonstantinMatskevich:testdata_path_calib3d
2014-01-16 16:44:24 +04:00
Konstantin Matskevich
b83eff7ecf
replaced sprintf with cv::format
2014-01-16 16:18:02 +04:00
Roman Donchenko
b0af6a2b58
Merge pull request #2127 from apavlenko:perf_cascades
2014-01-16 12:37:02 +04:00
Konstantin Matskevich
ab18c2d132
changed testdata path for calib3d
2014-01-15 15:08:09 +04:00
Andrey Pavlenko
c7d90c8b32
adding old cascade
2014-01-14 23:15:50 +04:00
Andrey Pavlenko
9b7b360bf7
fixing compilation if WITH_OPENCL=OFF
2014-01-14 17:50:00 +04:00
Ilya Lavrenov
7ed692bf92
fixed cv::cvtColor
2014-01-14 16:16:35 +04:00
Andrey Pavlenko
fdb1019b9e
Merge pull request #2147 from ilya-lavrenov:tapi_sqrt
2014-01-14 11:34:03 +04:00
Ilya Lavrenov
09bff78d63
deleted extra arg in case of power=0.5
2014-01-13 19:59:10 +04:00
Andrey Pavlenko
520a692fda
switching to CL_PERF_TEST_P
, adding safeFinish()
to flush CL queue
2014-01-13 16:58:36 +04:00
Roman Donchenko
af9cd79e16
Merge pull request #2121 from ilya-lavrenov:tapi_perf
2014-01-13 16:30:33 +04:00
Andrey Pavlenko
6071671bda
Merge pull request #2135 from alalek:ocl_runtime_cleanup_2
2014-01-11 17:15:22 +04:00
Ilya Lavrenov
da2790249e
added NORM_L2SQR type to cv::norm
2014-01-10 18:45:52 +04:00
Ilya Lavrenov
2e5e278271
added cv::PSNR performance test
2014-01-10 18:45:40 +04:00
Ilya Lavrenov
a01e81c8f7
added some performance tests
2014-01-10 18:45:40 +04:00
Ilya Lavrenov
1592234f1a
added mask support to cv::norm, cv::meanStdDev
2014-01-10 18:45:40 +04:00
Ilya Lavrenov
7852b2f155
updated docs according to the last changes
2014-01-10 18:19:26 +04:00
Ilya Lavrenov
8f9ccc099b
replaced Mat by Input/Output arrays
2014-01-10 18:16:56 +04:00
Ilya Lavrenov
118709fd9f
added OpenCL accelerated warpers
2014-01-10 18:16:56 +04:00
Roman Donchenko
5a9900481a
Merge pull request #2105 from ilya-lavrenov:norm
2014-01-10 18:12:08 +04:00
Alexander Alekhin
f7b0940d44
core/ocl: runtime, remove unused declarations
2014-01-10 11:42:02 +04:00
Andrey Pavlenko
2c0e24e948
adding Haar & LBP cascades perf test using UMat, removing old incomplete test
2014-01-10 00:08:15 +04:00
Ilya Lavrenov
dd302158e0
fixed case with zero mask
2014-01-09 19:26:09 +04:00
Andrey Pavlenko
a75cfe13e7
Merge pull request #2128 from alalek:ocl_cleanup_runtime
2014-01-09 17:08:48 +04:00
Ilya Lavrenov
9899cf7519
fixed cv::mixChannels perf test
2014-01-09 14:26:44 +04:00
Roman Donchenko
b45bb60c8b
Merge pull request #2126 from yinghau76:master
2014-01-09 14:00:53 +04:00
Ilya Lavrenov
6ee0b6eb56
added mask support to cv::norm, cv::meanStdDev
2014-01-09 13:49:42 +04:00
Alexander Alekhin
70a0327004
core/ocl: cleanup unused files
2014-01-09 13:47:04 +04:00
Roman Donchenko
6d84671e8b
Merge pull request #2116 from ilya-lavrenov:tapi_mixchannels_fix
2014-01-09 12:41:57 +04:00
Roman Donchenko
ea3dd9d5e7
Merge pull request #2103 from ilya-lavrenov:typo
2014-01-09 12:38:55 +04:00
Roman Donchenko
4e35ebb52f
Merge pull request #2102 from Nerei:compilatin_for_windows
2014-01-09 12:35:30 +04:00
Patrick Tsai
b24f7ee57c
Fix compiler error with Android NDK r8e
...
Original error without the fix:
opencv/modules/objdetect/src/cascadedetect.cpp: In member function 'bool cv::CascadeClassifierImpl::ocl_detectSingleScale(const cv::_InputArray&, cv::Size, int, double, cv::Size)':
/opencv/modules/objdetect/src/cascadedetect.cpp:1215:
error: no matching function for call to 'cv::ocl::Kernel::args(cv::ocl::KernelArg, cv::ocl::KernelArg, cv::ocl::KernelArg, int, cv::ocl::KernelArg, cv::ocl::KernelArg, cv::ocl::KernelArg, cv::Size&, int&, float, cv::Rect&, cv::Size&, cv::CascadeClassifierImpl::<anonymous enum>)'
2014-01-09 14:49:20 +08:00
Ilya Lavrenov
0119e8553c
fixed cv::mixChannels OpenCL version
2014-01-06 14:41:57 +04:00
Ilya Lavrenov
3a4d4080f4
fixed overflow for cv::norm NORM_L2
2014-01-04 15:20:50 +04:00
Ilya Lavrenov
0c49360318
fixed typo
2014-01-01 19:41:14 +04:00
Anatoly Baksheev
c2dd7fd762
compilation for windows
2014-01-01 15:39:21 +04:00
Vadim Pisarevsky
1c3bfae212
Merge pull request #1957 from Nerei:format_declaration_by_default
2013-12-31 15:55:00 +04:00
Roman Donchenko
cd576c7364
Merge pull request #2096 from kamjagin:master
2013-12-31 11:53:25 +04:00
Andrey Pavlenko
2d5723ccca
Merge pull request #2095 from ilya-lavrenov:tapi_mixchannels_fix
2013-12-31 00:35:39 +04:00
Andrey Pavlenko
967703c3ac
Merge pull request #2093 from SpecLad:merge-2.4
2013-12-31 00:26:22 +04:00
Andrey Pavlenko
8a456c5a6b
Merge pull request #2073 from KonstantinMatskevich:ocl_tapi_clahe
2013-12-31 00:17:33 +04:00
Miroslav Kobetski
3f07655231
Fix for bug #3469 CV_XADD failing in clang+nvcc combination
2013-12-30 17:00:17 +01:00
Andrey Pavlenko
8151571dd6
Merge pull request #2091 from ilya-lavrenov:tapi_convertScaleAbs
2013-12-30 19:54:27 +04:00
Ilya Lavrenov
3e1bec5248
added OpenCL version of cv::patchNaNs
2013-12-30 19:53:03 +04:00
Ilya Lavrenov
a2e683d133
fixed umat access
2013-12-30 19:37:20 +04:00
Roman Donchenko
cdc10defa3
Merge commit '05b9c991dd' into merge-2.4
...
Conflicts:
modules/cuda/test/test_objdetect.cpp
modules/gpu/perf/perf_core.cpp
modules/gpu/perf/perf_video.cpp
modules/gpu/test/test_core.cpp
2013-12-30 17:30:59 +04:00
Roman Donchenko
1312eca220
Merge commit '0566ab4d3d' into merge-2.4
...
Conflicts:
modules/core/src/system.cpp
2013-12-30 16:51:46 +04:00
Roman Donchenko
7f795e964f
Merge commit 'ee36717d' into merge-2.4
2013-12-30 16:49:39 +04:00
Roman Donchenko
9dfb96389c
Merge commit '4b885e206' into merge-2.4
2013-12-30 16:48:45 +04:00
Roman Donchenko
09e154d214
Merge commit '60906d917' into merge-2.4
...
Conflicts:
modules/ts/src/cuda_perf.cpp
2013-12-30 16:47:05 +04:00