Merge pull request #2567 from apavlenko:fix_compare_scalar

5a3200d5 · Andrey Pavlenko · OpenCV Buildbot · 9a3895d8 · 271f60ba · 5a3200d5
Commit 5a3200d5 authored Apr 03, 2014 by Andrey Pavlenko Committed by OpenCV Buildbot Apr 03, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 5 deletions

arithm.cpp modules/core/src/arithm.cpp +4 -5

No files found.
--- a/modules/core/src/arithm.cpp
+++ b/modules/core/src/arithm.cpp
@@ -2621,12 +2621,11 @@ static bool ocl_compare(InputArray _src1, InputArray _src2, OutputArray _dst, in
    int type1 = _src1.type(), depth1 = CV_MAT_DEPTH(type1), cn = CV_MAT_CN(type1),
            type2 = _src2.type(), depth2 = CV_MAT_DEPTH(type2);

-    if (!haveScalar)
-    {
-        if ( (!doubleSupport && depth1 == CV_64F) ||
-            !_src1.sameSize(_src2) || type1 != type2)
+    if (!doubleSupport && depth1 == CV_64F)
+        return false;
+
+    if (!haveScalar && (!_src1.sameSize(_src2) || type1 != type2))
            return false;
-    }

    int kercn = haveScalar ? cn : ocl::predictOptimalVectorWidth(_src1, _src2, _dst);
    // Workaround for bug with "?:" operator in AMD OpenCL compiler