Commit da806cc3 authored by Alexander Alekhin's avatar Alexander Alekhin

Merge pull request #3073 from vbystricky:ocl_fixMinMaxLoc

parents f937f4d9 6fb282aa
......@@ -185,7 +185,7 @@ __kernel void minmaxloc(__global const uchar * srcptr, int src_step, int src_off
#endif
{
#ifdef HAVE_SRC_CONT
src_index = mul24(id, srcTSIZE);
src_index = id * srcTSIZE;//mul24(id, srcTSIZE);
#else
src_index = mad24(id / cols, src_step, mul24(id % cols, srcTSIZE));
#endif
......
......@@ -1454,7 +1454,7 @@ static bool ocl_minMaxIdx( InputArray _src, double* minVal, double* maxVal, int*
CV_Assert(!haveSrc2 || _src2.type() == type);
if (depth == CV_32S || depth == CV_32F)
if (depth == CV_32S)
return false;
if ((depth == CV_64F || ddepth == CV_64F) && !doubleSupport)
......
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