Merge pull request #2380 from jet47:fix-3562

efafd4a9 · Roman Donchenko · OpenCV Buildbot · ce42593f · 7fd21d21 · efafd4a9
Commit efafd4a9 authored Feb 20, 2014 by Roman Donchenko Committed by OpenCV Buildbot Feb 20, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

canny.cu modules/gpu/src/cuda/canny.cu +4 -0

No files found.
--- a/modules/gpu/src/cuda/canny.cu
+++ b/modules/gpu/src/cuda/canny.cu
@@ -293,8 +293,12 @@ namespace canny
                n += smem[threadIdx.y + 2][threadIdx.x + 2] == 2;
            }

+            __syncthreads();
+
            if (n > 0)
                smem[threadIdx.y + 1][threadIdx.x + 1] = 2;
+
+            __syncthreads();
        }

        const int e = smem[threadIdx.y + 1][threadIdx.x + 1];