Merge pull request #3561 from jet47:cuda-arithm-refactoring

This commit is contained in:
Vadim Pisarevsky
2015-01-15 11:44:35 +00:00
34 changed files with 1404 additions and 713 deletions

View File

@@ -193,7 +193,7 @@ TEST(cornerHarris)
TEST(integral)
{
Mat src, sum;
cuda::GpuMat d_src, d_sum, d_buf;
cuda::GpuMat d_src, d_sum;
for (int size = 1000; size <= 4000; size *= 2)
{
@@ -209,10 +209,10 @@ TEST(integral)
d_src.upload(src);
cuda::integralBuffered(d_src, d_sum, d_buf);
cuda::integral(d_src, d_sum);
CUDA_ON;
cuda::integralBuffered(d_src, d_sum, d_buf);
cuda::integral(d_src, d_sum);
CUDA_OFF;
}
}