GPU resize became same as CPU implementation

diff --git a/modules/gpu/src/opencv2/gpu/device/filters.hpp b/modules/gpu/src/opencv2/gpu/device/filters.hpp
index c33a088..73e3788 100644 (file)
--- a/modules/gpu/src/opencv2/gpu/device/filters.hpp
+++ b/modules/gpu/src/opencv2/gpu/device/filters.hpp
@@ -64,7 +64,7 @@ namespace cv { namespace gpu { namespace device
 \r
         __device__ __forceinline__ elem_type operator ()(float y, float x) const\r
         {\r
-            return src(__float2int_rn(y), __float2int_rn(x));\r
+            return src(__float2int_rz(y), __float2int_rz(x));\r
         }\r
 \r
         const Ptr2D src;\r

diff --git a/modules/gpu/test/interpolation.hpp b/modules/gpu/test/interpolation.hpp
index e38dc4c..858f6be 100644 (file)
--- a/modules/gpu/test/interpolation.hpp
+++ b/modules/gpu/test/interpolation.hpp
@@ -54,7 +54,7 @@ template <typename T> struct NearestInterpolator
 {\r
     static T getValue(const cv::Mat& src, float y, float x, int c, int border_type, cv::Scalar borderVal = cv::Scalar())\r
     {\r
-        return readVal<T>(src, cvRound(y), cvRound(x), c, border_type, borderVal);\r
+        return readVal<T>(src, int(y), int(x), c, border_type, borderVal);\r
     }\r
 };\r
 \r

diff --git a/modules/gpu/test/test_resize.cpp b/modules/gpu/test/test_resize.cpp
index 4873dcc..7a7aaca 100644 (file)
--- a/modules/gpu/test/test_resize.cpp
+++ b/modules/gpu/test/test_resize.cpp
@@ -160,7 +160,7 @@ INSTANTIATE_TEST_CASE_P(GPU_ImgProc, Resize, testing::Combine(
 \r
 \r
 /////////////////\r
-PARAM_TEST_CASE(ResizeArea, cv::gpu::DeviceInfo, cv::Size, MatType, double, Interpolation, UseRoi)\r
+PARAM_TEST_CASE(ResizeSameAsHost, cv::gpu::DeviceInfo, cv::Size, MatType, double, Interpolation, UseRoi)\r
 {\r
     cv::gpu::DeviceInfo devInfo;\r
     cv::Size size;\r
@@ -182,6 +182,28 @@ PARAM_TEST_CASE(ResizeArea, cv::gpu::DeviceInfo, cv::Size, MatType, double, Inte
     }\r
 };\r
 \r
+// downscaling only: used for classifiers\r
+TEST_P(ResizeSameAsHost, Accuracy)\r
+{\r
+    cv::Mat src = randomMat(size, type);\r
+\r
+    cv::gpu::GpuMat dst = createMat(cv::Size(cv::saturate_cast<int>(src.cols * coeff), cv::saturate_cast<int>(src.rows * coeff)), type, useRoi);\r
+    cv::gpu::resize(loadMat(src, useRoi), dst, cv::Size(), coeff, coeff, interpolation);\r
+\r
+    cv::Mat dst_gold;\r
+    cv::resize(src, dst_gold, cv::Size(), coeff, coeff, interpolation);\r
+\r
+    EXPECT_MAT_NEAR(dst_gold, dst, src.depth() == CV_32F ? 1e-2 : 1.0);\r
+}\r
+\r
+INSTANTIATE_TEST_CASE_P(GPU_ImgProc, ResizeSameAsHost, testing::Combine(\r
+    ALL_DEVICES,\r
+    DIFFERENT_SIZES,\r
+    testing::Values(MatType(CV_8UC3), MatType(CV_16UC1), MatType(CV_16UC3), MatType(CV_16UC4), MatType(CV_32FC1), MatType(CV_32FC3), MatType(CV_32FC4)),\r
+    testing::Values(0.3, 0.5),\r
+    testing::Values(Interpolation(cv::INTER_AREA), Interpolation(cv::INTER_NEAREST)),  //, Interpolation(cv::INTER_LINEAR), Interpolation(cv::INTER_CUBIC)\r
+    WHOLE_SUBMAT));\r
+\r
 ///////////////////////////////////////////////////////////////////\r
 // Test NPP\r
 \r