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

fix bug #3678 (cuda::integral failures)

Browse Source
This commit is contained in:
Vladislav Vinogradov
2014-05-14 12:48:12 +04:00
parent e1b5a547cc
commit f1e44fa5ca
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
modules/cudev/include/opencv2/cudev/grid/detail/integral.hpp
View File

@@ -439,8 +439,6 @@ namespace integral_detail
T sum = (tidx < cols) && (y < rows) ? *p : 0;
y += blockDim.y;
sums[threadIdx.x][threadIdx.y] = sum;
__syncthreads();
@@ -467,14 +465,17 @@ namespace integral_detail
if (threadIdx.y > 0)
sum += sums[threadIdx.x][threadIdx.y - 1];
if (tidx < cols)
sum += stepSum;
stepSum += sums[threadIdx.x][blockDim.y - 1];
__syncthreads();
if ((tidx < cols) && (y < rows))
{
sum += stepSum;
stepSum += sums[threadIdx.x][blockDim.y - 1];
*p = sum;
}
__syncthreads();
y += blockDim.y;
}
#else
__shared__ T smem[32][32];