generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #4054 from gongzg:master

Browse Source
This commit is contained in:
Vadim Pisarevsky 2015-05-26 07:46:03 +00:00
commit b1a8e4f760
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/imgproc/src/opencl/canny.cl
View File

@ -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) 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 #pragma unroll
for (int j = 0; j < 8; ++j) for (int j = 0; j < 8; ++j)