Merge pull request #3073 from vbystricky:ocl_fixMinMaxLoc

10 years ago · da806cc3e7
parent f937f4d951 6fb282aa39
commit da806cc3e7
2 changed files with 2 additions and 2 deletions
--- a/modules/core/src/opencl/minmaxloc.cl
+++ b/modules/core/src/opencl/minmaxloc.cl
@ -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
--- a/modules/core/src/stat.cpp
+++ b/modules/core/src/stat.cpp
@ -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)