Merge pull request #2740 from ilya-lavrenov:tapi_norm_fix

f13e05cd · Roman Donchenko · OpenCV Buildbot · 46d672dc · f64dfeb2 · f13e05cd
Commit f13e05cd authored May 14, 2014 by Roman Donchenko Committed by OpenCV Buildbot May 14, 2014
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

reduce.cl modules/core/src/opencl/reduce.cl +1 -1

No files found.
--- a/modules/core/src/opencl/reduce.cl
+++ b/modules/core/src/opencl/reduce.cl
@@ -187,7 +187,7 @@
    if (mask[mask_index]) \
    { \
        temp = loadpix(srcptr + src_index); \
-        maxval = max(maxval, (srcT)(temp >= 0 ? temp : -temp)); \
+        maxval = max(maxval, (srcT)(temp >= (srcT)(0) ? temp : -temp)); \
    }
 #define SET_LOCAL_1 \
    localmem_max[lid] = maxval