Merge pull request #7072 from alalek:ocl_fix_canny

0dd00321 · Alexander Alekhin · GitHub · df665e23 · b8e08d5d · 0dd00321
Commit 0dd00321 authored Aug 10, 2016 by Alexander Alekhin Committed by GitHub Aug 10, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

canny.cl modules/imgproc/src/opencl/canny.cl +1 -1

No files found.
--- a/modules/imgproc/src/opencl/canny.cl
+++ b/modules/imgproc/src/opencl/canny.cl
@@ -260,7 +260,7 @@ __kernel void stage1_with_sobel(__global const uchar *src, int src_step, int src
 #ifdef L2GRAD
 #define dist(x, y) ((int)(x) * (x) + (int)(y) * (y))
 #else
-#define dist(x, y) (abs(x) + abs(y))
+#define dist(x, y) (abs((int)(x)) + abs((int)(y)))
 #endif

 __constant int prev[4][2] = {