Merge pull request #2380 from jet47:fix-3562

2014-02-20 13:41:45 +04:00
parent ce42593fe6 7fd21d217a
commit efafd4a9e5
1 changed files with 4 additions and 0 deletions
--- 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];