Merge pull request #4054 from gongzg:master

b1a8e4f7 · Vadim Pisarevsky · 2952c10c · 3c852009 · b1a8e4f7
隐藏空白更改
内联并排

Showing with 6 addition and 1 deletion

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

未找到文件。
--- a/modules/imgproc/src/opencl/canny.cl
+++ b/modules/imgproc/src/opencl/canny.cl
@@ -430,7 +430,12 @@ __kernel void stage2_hysteresis(__global uchar *map_ptr, int map_step, int map_o

        for (int i = 0; i < pix_per_thr; ++i)
        {
-            ushort2 pos = l_stack[ atomic_dec(&l_counter) - 1 ];
+            int index = atomic_dec(&l_counter) - 1;
+            if (index < 0) {
+               atomic_inc(&l_counter);
+               continue;
+            }
+            ushort2 pos = l_stack[ index ];

            #pragma unroll
            for (int j = 0; j < 8; ++j)