Merge origin/master into cuda-dev

2012-11-26 18:54:29 +04:00
parent afff9cf716 5c2d59066f
commit 1712d0930c
160 changed files with 2239 additions and 1056 deletions
--- a/modules/gpu/src/cuda/hough.cu
+++ b/modules/gpu/src/cuda/hough.cu
@@ -236,7 +236,7 @@ namespace cv { namespace gpu { namespace device
            const int r = blockIdx.x * blockDim.x + threadIdx.x;
            const int n = blockIdx.y * blockDim.y + threadIdx.y;

-            if (r >= accum.cols - 2 && n >= accum.rows - 2)
+            if (r >= accum.cols - 2 || n >= accum.rows - 2)
                return;

            const int curVotes = accum(n + 1, r + 1);