Merge pull request #3023 from vbystricky:ocl_minMaxLoc

11 years ago · b3e31fb8d6
parent 18de8dee62 b48e487d53
commit b3e31fb8d6
2 changed files with 3 additions and 3 deletions
--- a/modules/core/src/opencl/minmaxloc.cl
+++ b/modules/core/src/opencl/minmaxloc.cl
@ -209,7 +209,7 @@ __kernel void minmaxloc(__global const uchar * srcptr, int src_step, int src_off

 #if kercn == 1
 #ifdef NEED_MINVAL
-#if NEED_MINLOC
+#ifdef NEED_MINLOC
            if (minval > temp)
            {
                minval = temp;
@ -326,7 +326,7 @@ __kernel void minmaxloc(__global const uchar * srcptr, int src_step, int src_off
            int lid2 = lsize + lid;

 #ifdef NEED_MINVAL
-#ifdef NEED_MAXLOC
+#ifdef NEED_MINLOC
            if (localmem_min[lid] >= localmem_min[lid2])
            {
                if (localmem_min[lid] == localmem_min[lid2])
--- a/modules/core/src/stat.cpp
+++ b/modules/core/src/stat.cpp
@ -1452,7 +1452,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 || !_mask.empty())
+    if (depth == CV_32S || depth == CV_32F)
        return false;

    if ((depth == CV_64F || ddepth == CV_64F) && !doubleSupport)