modified according to NPP for CUDA 3.2 API updates.

diff --git a/modules/gpu/include/opencv2/gpu/gpu.hpp b/modules/gpu/include/opencv2/gpu/gpu.hpp
index 38edb9d..a58d4b0 100644 (file)
--- a/modules/gpu/include/opencv2/gpu/gpu.hpp
+++ b/modules/gpu/include/opencv2/gpu/gpu.hpp
@@ -372,6 +372,7 @@ namespace cv
         //! computes norm of array\r
         //! Supports NORM_INF, NORM_L1, NORM_L2\r
         CV_EXPORTS double norm(const GpuMat& src1, int normType=NORM_L2);\r
+        \r
         //! computes norm of the difference between two arrays\r
         //! Supports NORM_INF, NORM_L1, NORM_L2\r
         CV_EXPORTS double norm(const GpuMat& src1, const GpuMat& src2, int normType=NORM_L2);\r
@@ -475,11 +476,9 @@ namespace cv
 \r
         //! smooths the image using the normalized box filter\r
         CV_EXPORTS void boxFilter(const GpuMat& src, GpuMat& dst, Size ksize, Point anchor = Point(-1,-1));\r
+\r
         //! a synonym for normalized box filter\r
-        static inline void blur(const GpuMat& src, GpuMat& dst, Size ksize, Point anchor = Point(-1,-1))\r
-        {\r
-            boxFilter(src, dst, ksize, anchor);\r
-        }\r
+        static inline void blur(const GpuMat& src, GpuMat& dst, Size ksize, Point anchor = Point(-1,-1)) { boxFilter(src, dst, ksize, anchor); }\r
 \r
         //! erodes the image (applies the local minimum operator)\r
         CV_EXPORTS void erode( const GpuMat& src, GpuMat& dst, const Mat& kernel, Point anchor, int iterations);\r

diff --git a/modules/gpu/src/arithm.cpp b/modules/gpu/src/arithm.cpp
index a21acbb..7aa81a9 100644 (file)
--- a/modules/gpu/src/arithm.cpp
+++ b/modules/gpu/src/arithm.cpp
@@ -310,18 +310,25 @@ Scalar cv::gpu::sum(const GpuMat& src)
     CV_Assert(src.type() == CV_8UC1 || src.type() == CV_8UC4);\r
     \r
     Scalar res;\r
+    \r
 \r
     NppiSize sz;\r
     sz.width  = src.cols;\r
     sz.height = src.rows;\r
 \r
+    int bufsz;\r
+    \r
     if (src.type() == CV_8UC1)\r
-    {\r
-        nppSafeCall( nppiSum_8u_C1R(src.ptr<Npp8u>(), src.step, sz, res.val) );\r
+    {        \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
     else\r
-    {\r
-        nppSafeCall( nppiSum_8u_C4R(src.ptr<Npp8u>(), src.step, sz, res.val) );\r
+    {                \r
+        nppiReductionGetBufferHostSize_8u_C4R(sz, &bufsz);\r
+        GpuMat buf(1, bufsz, CV_32S);\r
+        nppSafeCall( nppiSum_8u_C4R(src.ptr<Npp8u>(), src.step, sz, buf.ptr<Npp32s>(), res.val) );\r
     }\r
 \r
     return res;\r

diff --git a/modules/gpu/src/npp_error.cpp b/modules/gpu/src/error.cpp
similarity index 85%
rename from modules/gpu/src/npp_error.cpp
rename to modules/gpu/src/error.cpp
index df22b80..eeaf86d 100644 (file)
--- a/modules/gpu/src/npp_error.cpp
+++ b/modules/gpu/src/error.cpp
@@ -42,6 +42,7 @@
 \r
 #include "precomp.hpp"\r
 \r
+\r
 using namespace cv;\r
 using namespace cv::gpu;\r
 \r
@@ -56,7 +57,7 @@ namespace
     struct NppError\r
     {\r
         int error;\r
-        const char* str;\r
+        string str;\r
     } \r
     npp_errors [] = \r
     {\r
@@ -95,8 +96,9 @@ namespace
         { NPP_WRONG_INTERSECTION_QUAD_WARNING, "NPP_WRONG_INTERSECTION_QUAD_WARNING" },\r
         { NPP_MISALIGNED_DST_ROI_WARNING, "NPP_MISALIGNED_DST_ROI_WARNING" },\r
         { NPP_AFFINE_QUAD_INCORRECT_WARNING, "NPP_AFFINE_QUAD_INCORRECT_WARNING" },\r
-        { NPP_AFFINE_QUAD_CHANGED_WARNING, "NPP_AFFINE_QUAD_CHANGED_WARNING" },\r
-        { NPP_ADJUSTED_ROI_SIZE_WARNING, "NPP_ADJUSTED_ROI_SIZE_WARNING" },\r
+        //disabled in NPP for cuda 3.2-rc\r
+        //{ NPP_AFFINE_QUAD_CHANGED_WARNING, "NPP_AFFINE_QUAD_CHANGED_WARNING" },\r
+        //{ NPP_ADJUSTED_ROI_SIZE_WARNING, "NPP_ADJUSTED_ROI_SIZE_WARNING" },\r
         { NPP_DOUBLE_SIZE_WARNING, "NPP_DOUBLE_SIZE_WARNING" },\r
         { NPP_ODD_ROI_WARNING, "NPP_ODD_ROI_WARNING" }\r
     };\r
@@ -116,17 +118,26 @@ namespace cv
 {\r
     namespace gpu\r
     {\r
-        extern "C" const char* getNppErrorString( int err )\r
+        const string getNppErrorString( int err )\r
         {\r
             int idx = std::find_if(npp_errors, npp_errors + error_num, Searcher(err)) - npp_errors;\r
+            const string& msg = (idx != error_num) ? npp_errors[idx].str : string("Unknown error code");\r
+\r
+            std::stringstream interpreter;\r
+            interpreter << "<" << err << "> " << msg;\r
 \r
-            return (idx != error_num) ? npp_errors[idx].str : "";             \r
+            return interpreter.str();\r
         }\r
 \r
         extern "C" void npp_error( int err, const char *file, const int line, const char *func)\r
         {                    \r
             cv::error( cv::Exception(CV_GpuNppCallError, getNppErrorString(err), func, file, line) );                \r
         }\r
+\r
+        extern "C" void error(const char *error_string, const char *file, const int line, const char *func)\r
+        {                       \r
+            cv::error( cv::Exception(CV_GpuApiCallError, error_string, func, file, line) );\r
+        }\r
     }\r
 }\r
 \r

diff --git a/modules/gpu/src/precomp.cpp b/modules/gpu/src/precomp.cpp
index d0216db..2bf93e6 100644 (file)
--- a/modules/gpu/src/precomp.cpp
+++ b/modules/gpu/src/precomp.cpp
@@ -41,16 +41,4 @@
 \r
 #include "precomp.hpp"\r
 \r
-/* End of file. */\r
-\r
-\r
-namespace cv\r
-{\r
-    namespace gpu\r
-    {\r
-        extern "C" void error(const char *error_string, const char *file, const int line, const char *func)\r
-        {                       \r
-            cv::error( cv::Exception(CV_GpuApiCallError, error_string, func, file, line) );\r
-        }\r
-    }\r
-}\r
+/* End of file. */
\ No newline at end of file

diff --git a/modules/gpu/src/precomp.hpp b/modules/gpu/src/precomp.hpp
index 43d2985..d9a7a91 100644 (file)
--- a/modules/gpu/src/precomp.hpp
+++ b/modules/gpu/src/precomp.hpp
@@ -54,6 +54,7 @@
 #include <limits>\r
 #include <vector>\r
 #include <algorithm>\r
+#include <sstream>\r
 \r
 #include "opencv2/gpu/gpu.hpp"\r
 #include "opencv2/imgproc/imgproc.hpp"\r