Skip to content

O
opencv
Commit ac1c6dac authored by Andrey Pavlenko's avatar Andrey Pavlenko Committed by OpenCV Buildbot
Browse files
Options

Merge pull request #1978 from ilya-lavrenov:ocl_min_max

parents f3e2bfea b20714a8
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
modules/core/src/arithm.cpp
View file @ ac1c6dac
...@@ -937,10 +937,10 @@ static bool ocl_binary_op(InputArray _src1, InputArray _src2, OutputArray _dst, ...@@ -937,10 +937,10 @@ static bool ocl_binary_op(InputArray _src1, InputArray _src2, OutputArray _dst,
char opts[1024]; char opts[1024];
int kercn = haveMask || haveScalar ? cn : 1; 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], (haveMask ? "MASK_" : ""), (haveScalar ? "UNARY_OP" : "BINARY_OP"), oclop2str[oclop],
bitwise ? ocl::memopTypeToStr(CV_MAKETYPE(srcdepth, kercn)) : 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); ocl::Kernel k("KF", ocl::core::arithm_oclsrc, opts);
if( k.empty() ) if( k.empty() )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment