added black list for gpu tests

diff --git a/modules/gpu/src/arithm.cpp b/modules/gpu/src/arithm.cpp
index 7aa81a9..d0105ef 100644 (file)
--- a/modules/gpu/src/arithm.cpp
+++ b/modules/gpu/src/arithm.cpp
@@ -309,7 +309,7 @@ Scalar cv::gpu::sum(const GpuMat& src)
 {\r
     CV_Assert(src.type() == CV_8UC1 || src.type() == CV_8UC4);\r
     \r
-    Scalar res;\r
+    \r
     \r
 \r
     NppiSize sz;\r
@@ -322,16 +322,22 @@ Scalar cv::gpu::sum(const GpuMat& src)
     {        \r
         nppiReductionGetBufferHostSize_8u_C1R(sz, &bufsz);\r
         GpuMat buf(1, bufsz, CV_32S);\r
-        nppSafeCall( nppiSum_8u_C1R(src.ptr<Npp8u>(), src.step, sz, buf.ptr<Npp32s>(), res.val) );\r
+\r
+        Scalar res;\r
+         nppSafeCall( nppiSum_8u_C1R(src.ptr<Npp8u>(), src.step, sz, buf.ptr<Npp32s>(), res.val) );\r
+        return res;\r
     }\r
     else\r
     {                \r
         nppiReductionGetBufferHostSize_8u_C4R(sz, &bufsz);\r
         GpuMat buf(1, bufsz, CV_32S);\r
+\r
+        Scalar res;\r
         nppSafeCall( nppiSum_8u_C4R(src.ptr<Npp8u>(), src.step, sz, buf.ptr<Npp32s>(), res.val) );\r
+        return res;\r
     }\r
 \r
-    return res;\r
+    \r
 }\r
 \r
 ////////////////////////////////////////////////////////////////////////\r

diff --git a/modules/gpu/src/error.cpp b/modules/gpu/src/error.cpp
index eeaf86d..04efd0e 100644 (file)
--- a/modules/gpu/src/error.cpp
+++ b/modules/gpu/src/error.cpp
@@ -124,7 +124,7 @@ namespace cv
             const string& msg = (idx != error_num) ? npp_errors[idx].str : string("Unknown error code");\r
 \r
             std::stringstream interpreter;\r
-            interpreter << "<" << err << "> " << msg;\r
+            interpreter << msg <<" [Code = " << err << "]";\r
 \r
             return interpreter.str();\r
         }\r

diff --git a/modules/gpu/src/filtering_npp.cpp b/modules/gpu/src/filtering_npp.cpp
index 7a914f8..e8163d4 100644 (file)
--- a/modules/gpu/src/filtering_npp.cpp
+++ b/modules/gpu/src/filtering_npp.cpp
@@ -69,7 +69,7 @@ namespace
         \r
         NppiSize sz;\r
         sz.width = src.cols;\r
-        sz.height = dst.rows;\r
+        sz.height = src.rows;\r
 \r
         NppiSize mask_sz;\r
         mask_sz.width = kernel.cols;\r

diff --git a/tests/gpu/src/arithm.cpp b/tests/gpu/src/arithm.cpp
index 366af75..b9033f0 100644 (file)
--- a/tests/gpu/src/arithm.cpp
+++ b/tests/gpu/src/arithm.cpp
@@ -590,6 +590,6 @@ CV_GpuNppImageCompareTest CV_GpuNppImageCompare_test;
 CV_GpuNppImageMeanStdDevTest CV_GpuNppImageMeanStdDev_test;\r
 CV_GpuNppImageNormTest CV_GpuNppImageNorm_test;\r
 CV_GpuNppImageFlipTest CV_GpuNppImageFlip_test;\r
-//CV_GpuNppImageSumTest CV_GpuNppImageSum_test;\r
+CV_GpuNppImageSumTest CV_GpuNppImageSum_test;\r
 CV_GpuNppImageMinNaxTest CV_GpuNppImageMinNax_test;\r
 CV_GpuNppImageLUTTest CV_GpuNppImageLUT_test;
\ No newline at end of file

diff --git a/tests/gpu/src/gputest_main.cpp b/tests/gpu/src/gputest_main.cpp
index 1d15f9b..2a2be4d 100644 (file)
--- a/tests/gpu/src/gputest_main.cpp
+++ b/tests/gpu/src/gputest_main.cpp
@@ -43,9 +43,15 @@
 
 CvTS test_system;
 
+const char* blacklist[] =
+{    
+    "GPU-NppImageSum",
+    0
+};
+
 int main( int argc, char** argv )
 {
-    return test_system.run( argc, argv );
+    return test_system.run( argc, argv, blacklist );
 }
 
 /* End of file. */