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

Fixed the race condition between inc and dec on the l_counter.

Browse Source 
Signed-off-by: Zhigang Gong <zhigang.gong@intel.com>
This commit is contained in:
Zhigang Gong 2015-05-26 22:06:18 +08:00
parent b1a8e4f760
commit 0f7de40e66
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -431,10 +431,8 @@ __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)
{ {
int index = atomic_dec(&l_counter) - 1; int index = atomic_dec(&l_counter) - 1;
if (index < 0) { if (index < 0)
atomic_inc(&l_counter);
continue; continue;
}
ushort2 pos = l_stack[ index ]; ushort2 pos = l_stack[ index ];
#pragma unroll #pragma unroll
@ -454,6 +452,9 @@ __kernel void stage2_hysteresis(__global uchar *map_ptr, int map_step, int map_o
} }
} }
barrier(CLK_LOCAL_MEM_FENCE); barrier(CLK_LOCAL_MEM_FENCE);
if (l_counter < 0)
l_counter = 0;
barrier(CLK_LOCAL_MEM_FENCE);
while (p_counter > 0) while (p_counter > 0)
{ {
@ -496,4 +497,4 @@ __kernel void getEdges(__global const uchar *mapptr, int map_step, int map_offse
} }
} }
#endif #endif