mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-26 20:20:20 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1978 from ilya-lavrenov:ocl_min_max

Browse Source
This commit is contained in:
Andrey Pavlenko 2013-12-12 09:55:49 +04:00 committed by OpenCV Buildbot
commit ac1c6dac93
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/core/src/arithm.cpp
View File

@ -937,10 +937,10 @@ static bool ocl_binary_op(InputArray _src1, InputArray _src2, OutputArray _dst,
char opts[1024];
int kercn = haveMask || haveScalar ? cn : 1;
sprintf(opts, "-D %s%s -D %s -D dstT=%s",
sprintf(opts, "-D %s%s -D %s -D dstT=%s%s",
(haveMask ? "MASK_" : ""), (haveScalar ? "UNARY_OP" : "BINARY_OP"), oclop2str[oclop],
bitwise ? ocl::memopTypeToStr(CV_MAKETYPE(srcdepth, kercn)) :
ocl::typeToStr(CV_MAKETYPE(srcdepth, kercn)));
ocl::typeToStr(CV_MAKETYPE(srcdepth, kercn)), doubleSupport ? " -D DOUBLE_SUPPORT" : "");
ocl::Kernel k("KF", ocl::core::arithm_oclsrc, opts);
if( k.empty() )