disabled NPP resize for 8uc4+Cubic (Bug #2388)

diff --git a/modules/gpu/src/resize.cpp b/modules/gpu/src/resize.cpp
index edf2fc8..3da1a8d 100644 (file)
--- a/modules/gpu/src/resize.cpp
+++ b/modules/gpu/src/resize.cpp
@@ -102,7 +102,7 @@ void cv::gpu::resize(const GpuMat& src, GpuMat& dst, Size dsize, double fx, doub
     src.locateROI(wholeSize, ofs);\r
 \r
     bool useNpp = (src.type() == CV_8UC1 || src.type() == CV_8UC4);\r
-    useNpp = useNpp && (interpolation == INTER_NEAREST || interpolation == INTER_LINEAR || (src.type() == CV_8UC4 && interpolation != INTER_AREA));\r
+    useNpp = useNpp && (interpolation == INTER_NEAREST || interpolation == INTER_LINEAR);\r
 \r
     if (useNpp)\r
     {\r

diff --git a/modules/gpu/test/test_resize.cpp b/modules/gpu/test/test_resize.cpp
index 73b8d9f..8be1a5d 100644 (file)
--- a/modules/gpu/test/test_resize.cpp
+++ b/modules/gpu/test/test_resize.cpp
@@ -226,10 +226,8 @@ PARAM_TEST_CASE(ResizeNPP, cv::gpu::DeviceInfo, MatType, double, Interpolation)
 \r
 TEST_P(ResizeNPP, Accuracy)\r
 {\r
-    if (type == CV_8UC1 && interpolation == cv::INTER_CUBIC)\r
-        return;\r
-\r
     cv::Mat src = readImageType("stereobp/aloe-L.png", type);\r
+    ASSERT_FALSE(src.empty());\r
 \r
     cv::gpu::GpuMat dst;\r
     cv::gpu::resize(loadMat(src), dst, cv::Size(), coeff, coeff, interpolation);\r
@@ -244,6 +242,6 @@ INSTANTIATE_TEST_CASE_P(GPU_ImgProc, ResizeNPP, testing::Combine(
     ALL_DEVICES,\r
     testing::Values(MatType(CV_8UC1), MatType(CV_8UC4)),\r
     testing::Values(0.3, 0.5, 1.5, 2.0),\r
-    testing::Values(Interpolation(cv::INTER_NEAREST), Interpolation(cv::INTER_LINEAR), Interpolation(cv::INTER_CUBIC))));\r
+    testing::Values(Interpolation(cv::INTER_NEAREST), Interpolation(cv::INTER_LINEAR))));\r
 \r
 #endif // HAVE_CUDA\r