From 6d06fcb414190c24e4a26c1596da143b519e53e5 Mon Sep 17 00:00:00 2001 From: catree Date: Mon, 4 Dec 2017 02:22:52 +0100 Subject: [PATCH] Fix CUDA integral. --- modules/cudaarithm/test/test_reductions.cpp | 2 +- modules/cudev/include/opencv2/cudev/grid/detail/integral.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/cudaarithm/test/test_reductions.cpp b/modules/cudaarithm/test/test_reductions.cpp index 48abdfe..9bfa788 100644 --- a/modules/cudaarithm/test/test_reductions.cpp +++ b/modules/cudaarithm/test/test_reductions.cpp @@ -1076,7 +1076,7 @@ CUDA_TEST_P(Integral, Accuracy) INSTANTIATE_TEST_CASE_P(CUDA_Arithm, Integral, testing::Combine( ALL_DEVICES, - testing::Values(cv::Size(128, 128), cv::Size(113, 113), cv::Size(768, 1066)), + testing::Values(cv::Size(16, 16), cv::Size(128, 128), cv::Size(113, 113), cv::Size(768, 1066)), WHOLE_SUBMAT)); /////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/modules/cudev/include/opencv2/cudev/grid/detail/integral.hpp b/modules/cudev/include/opencv2/cudev/grid/detail/integral.hpp index 0475ebd..7672aca 100644 --- a/modules/cudev/include/opencv2/cudev/grid/detail/integral.hpp +++ b/modules/cudev/include/opencv2/cudev/grid/detail/integral.hpp @@ -598,7 +598,7 @@ namespace integral_detail __host__ static void integral(const GlobPtr& src, const GlobPtr& dst, int rows, int cols, cudaStream_t stream) { if (deviceSupports(FEATURE_SET_COMPUTE_30) - && (cols % 16 == 0) + && (cols % 64 == 0) && reinterpret_cast(src.data) % 32 == 0 && reinterpret_cast(dst.data) % 32 == 0) { -- 2.7.4