fixed gpu morphology: now kernel in gpu is passed to npp functions.

warnings in cxcore
added graphcut wrapper

diff --git a/modules/core/src/matop.cpp b/modules/core/src/matop.cpp
index f249992..6406eba 100644 (file)
--- a/modules/core/src/matop.cpp
+++ b/modules/core/src/matop.cpp
@@ -57,7 +57,7 @@ public:
     MatOp_Identity() {}
     virtual ~MatOp_Identity() {}
 
-    bool elementWise(const MatExpr& expr) const { return true; }
+    bool elementWise(const MatExpr& /*expr*/) const { return true; }
     void assign(const MatExpr& expr, Mat& m, int type=-1) const;
             
     static void makeExpr(MatExpr& res, const Mat& m);
@@ -71,7 +71,7 @@ public:
     MatOp_AddEx() {}
     virtual ~MatOp_AddEx() {}
     
-    bool elementWise(const MatExpr& expr) const { return true; }
+    bool elementWise(const MatExpr& /*expr*/) const { return true; }
     void assign(const MatExpr& expr, Mat& m, int type=-1) const;
     
     void add(const MatExpr& e1, const Scalar& s, MatExpr& res) const;
@@ -93,7 +93,7 @@ public:
     MatOp_Bin() {}
     virtual ~MatOp_Bin() {}
     
-    bool elementWise(const MatExpr& expr) const { return true; }
+    bool elementWise(const MatExpr& /*expr*/) const { return true; }
     void assign(const MatExpr& expr, Mat& m, int type=-1) const;
         
     void multiply(const MatExpr& e1, double s, MatExpr& res) const;
@@ -111,7 +111,7 @@ public:
     MatOp_Cmp() {}
     virtual ~MatOp_Cmp() {}
     
-    bool elementWise(const MatExpr& expr) const { return true; }
+    bool elementWise(const MatExpr& /*expr*/) const { return true; }
     void assign(const MatExpr& expr, Mat& m, int type=-1) const;
     
     static void makeExpr(MatExpr& res, int cmpop, const Mat& a, const Mat& b);
@@ -126,7 +126,7 @@ public:
     MatOp_GEMM() {}
     virtual ~MatOp_GEMM() {}
     
-    bool elementWise(const MatExpr& expr) const { return false; }
+    bool elementWise(const MatExpr& /*expr*/) const { return false; }
     void assign(const MatExpr& expr, Mat& m, int type=-1) const;
     
     void add(const MatExpr& e1, const MatExpr& e2, MatExpr& res) const;
@@ -147,7 +147,7 @@ public:
     MatOp_Invert() {}
     virtual ~MatOp_Invert() {}
     
-    bool elementWise(const MatExpr& expr) const { return false; }
+    bool elementWise(const MatExpr& /*expr*/) const { return false; }
     void assign(const MatExpr& expr, Mat& m, int type=-1) const;
     
     void matmul(const MatExpr& expr1, const MatExpr& expr2, MatExpr& res) const;
@@ -163,7 +163,7 @@ public:
     MatOp_T() {}
     virtual ~MatOp_T() {}
     
-    bool elementWise(const MatExpr& expr) const { return false; }
+    bool elementWise(const MatExpr& /*expr*/) const { return false; }
     void assign(const MatExpr& expr, Mat& m, int type=-1) const;
     
     void multiply(const MatExpr& e1, double s, MatExpr& res) const;
@@ -180,7 +180,7 @@ public:
     MatOp_Solve() {}
     virtual ~MatOp_Solve() {}
     
-    bool elementWise(const MatExpr& expr) const { return false; }
+    bool elementWise(const MatExpr& /*expr*/) const { return false; }
     void assign(const MatExpr& expr, Mat& m, int type=-1) const;
     
     static void makeExpr(MatExpr& res, int method, const Mat& a, const Mat& b);
@@ -194,7 +194,7 @@ public:
     MatOp_Initializer() {}
     virtual ~MatOp_Initializer() {}
     
-    bool elementWise(const MatExpr& expr) const { return false; }
+    bool elementWise(const MatExpr& /*expr*/) const { return false; }
     void assign(const MatExpr& expr, Mat& m, int type=-1) const;
     
     void multiply(const MatExpr& e, double s, MatExpr& res) const;
@@ -217,7 +217,7 @@ static inline bool isInitializer(const MatExpr& e) { return e.op == &g_MatOp_Ini
     
 /////////////////////////////////////////////////////////////////////////////////////////////////////
     
-bool MatOp::elementWise(const MatExpr& expr) const
+bool MatOp::elementWise(const MatExpr& /*expr*/) const
 {
     return false;
 }

diff --git a/modules/gpu/include/opencv2/gpu/gpu.hpp b/modules/gpu/include/opencv2/gpu/gpu.hpp
index 314a8c2..8c9614d 100644 (file)
--- a/modules/gpu/include/opencv2/gpu/gpu.hpp
+++ b/modules/gpu/include/opencv2/gpu/gpu.hpp
@@ -533,6 +533,12 @@ namespace cv
         //! applies an advanced morphological operation to the image\r
         CV_EXPORTS void morphologyEx( const GpuMat& src, GpuMat& dst, int op, const Mat& kernel, Point anchor, int iterations);\r
 \r
+\r
+        //////////////////////////////// Image Labeling ////////////////////////////////\r
+\r
+        //!performs labeling via graph cuts\r
+        CV_EXPORTS void graphcut(GpuMat& terminals, GpuMat& leftTransp, GpuMat& rightTransp, GpuMat& top, GpuMat& bottom, GpuMat& labels, GpuMat& buf);\r
+\r
         //////////////////////////////// StereoBM_GPU ////////////////////////////////\r
 \r
         class CV_EXPORTS StereoBM_GPU\r

diff --git a/modules/gpu/src/filtering_npp.cpp b/modules/gpu/src/filtering_npp.cpp
index e8163d4..8ceb44e 100644 (file)
--- a/modules/gpu/src/filtering_npp.cpp
+++ b/modules/gpu/src/filtering_npp.cpp
@@ -62,11 +62,14 @@ namespace
     void morphoogy_caller(npp_morf_func func, const GpuMat& src, GpuMat& dst, const Mat& kernel, Point anchor, int iterations)\r
     {\r
         CV_Assert(src.type() == CV_8U || src.type() == CV_8UC4);        \r
-        CV_Assert(kernel.isContinuous() && kernel.type() == CV_8U && (kernel.cols & 1) != 0 && (kernel.rows & 1) != 0);\r
+        CV_Assert(kernel.type() == CV_8U && (kernel.cols & 1) != 0 && (kernel.rows & 1) != 0);\r
 \r
         // in NPP for Cuda 3.1 only such anchor is supported.\r
         CV_Assert(anchor.x == kernel.cols/2 && anchor.y == kernel.rows/2);\r
-        \r
+\r
+        const Mat& cont_krnl = (kernel.isContinuous() ? kernel : kernel.clone()).reshape(1, 1);\r
+        GpuMat gpu_krnl(cont_krnl);\r
+                \r
         NppiSize sz;\r
         sz.width = src.cols;\r
         sz.height = src.rows;\r
@@ -82,7 +85,7 @@ namespace
         dst.create(src.size(), src.type());\r
 \r
         for(int i = 0; i < iterations; ++i)\r
-            nppSafeCall( func(src.ptr<Npp8u>(), src.step, dst.ptr<Npp8u>(), dst.step, sz, kernel.ptr<Npp8u>(), mask_sz, anc) );\r
+            nppSafeCall( func(src.ptr<Npp8u>(), src.step, dst.ptr<Npp8u>(), dst.step, sz, gpu_krnl.ptr<Npp8u>(), mask_sz, anc) );\r
     }\r
 }\r
 \r

diff --git a/modules/gpu/src/graphcuts.cpp b/modules/gpu/src/graphcuts.cpp
new file mode 100644 (file)
index 0000000..6b29af1
--- /dev/null
+++ b/modules/gpu/src/graphcuts.cpp
@@ -0,0 +1,83 @@
+/*M///////////////////////////////////////////////////////////////////////////////////////\r
+//\r
+//  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.\r
+//\r
+//  By downloading, copying, installing or using the software you agree to this license.\r
+//  If you do not agree to this license, do not download, install,\r
+//  copy or use the software.\r
+//\r
+//\r
+//                           License Agreement\r
+//                For Open Source Computer Vision Library\r
+//\r
+// Copyright (C) 2000-2008, Intel Corporation, all rights reserved.\r
+// Copyright (C) 2009, Willow Garage Inc., all rights reserved.\r
+// Third party copyrights are property of their respective owners.\r
+//\r
+// Redistribution and use in source and binary forms, with or without modification,\r
+// are permitted provided that the following conditions are met:\r
+//\r
+//   * Redistribution's of source code must retain the above copyright notice,\r
+//     this list of conditions and the following disclaimer.\r
+//\r
+//   * Redistribution's in binary form must reproduce the above copyright notice,\r
+//     this list of conditions and the following disclaimer in the documentation\r
+//     and/or other GpuMaterials provided with the distribution.\r
+//\r
+//   * The name of the copyright holders may not be used to endorse or promote products\r
+//     derived from this software without specific prior written permission.\r
+//\r
+// This software is provided by the copyright holders and contributors "as is" and\r
+// any express or bpied warranties, including, but not limited to, the bpied\r
+// warranties of merchantability and fitness for a particular purpose are disclaimed.\r
+// In no event shall the Intel Corporation or contributors be liable for any direct,\r
+// indirect, incidental, special, exemplary, or consequential damages\r
+// (including, but not limited to, procurement of substitute goods or services;\r
+// loss of use, data, or profits; or business interruption) however caused\r
+// and on any theory of liability, whether in contract, strict liability,\r
+// or tort (including negligence or otherwise) arising in any way out of\r
+// the use of this software, even if advised of the possibility of such damage.\r
+//\r
+//M*/\r
+\r
+#include "precomp.hpp"\r
+\r
+#if !defined (HAVE_CUDA)\r
+\r
+void cv::gpu::graphcut(GpuMat&, GpuMat&, GpuMat&, GpuMat&, GpuMat&, GpuMat&, GpuMat&) { throw_nogpu(); }\r
+\r
+#else /* !defined (HAVE_CUDA) */\r
+\r
+void cv::gpu::graphcut(GpuMat& terminals, GpuMat& leftTransp, GpuMat& rightTransp, GpuMat& top, GpuMat& bottom, GpuMat& labels, GpuMat& buf)\r
+{\r
+    CV_Assert(leftTransp.type() == CV_32S && rightTransp.type() == CV_32S);\r
+    CV_Assert(terminals.type() == CV_32S && bottom.type() == CV_32S && top.type() == CV_32S);\r
+    CV_Assert(terminals.size() == leftTransp.size());\r
+    CV_Assert(terminals.size() == rightTransp.size());\r
+    CV_Assert(terminals.size() == top.size() && terminals.size() == bottom.size());    \r
+    CV_Assert(top.step == bottom.step && top.step == terminals.step && rightTransp.step == leftTransp.step);\r
+        \r
+    labels.create(terminals.size(), CV_8U);\r
+\r
+    NppiSize sznpp;\r
+    sznpp.width = terminals.cols;\r
+    sznpp.height = terminals.rows;\r
+\r
+    int bufsz;\r
+    nppSafeCall( nppiGraphcutGetSize(sznpp, &bufsz) );\r
+\r
+    if ((size_t)bufsz > buf.cols * buf.rows * buf.elemSize())\r
+        buf.create(1, bufsz, CV_8U);\r
+\r
+    nppSafeCall( nppiGraphcut_32s8u(terminals.ptr<Npp32s>(), leftTransp.ptr<Npp32s>(), rightTransp.ptr<Npp32s>(), top.ptr<Npp32s>(), bottom.ptr<Npp32s>(), \r
+        terminals.step, leftTransp.step, sznpp, labels.ptr<Npp8u>(), labels.step, buf.ptr<Npp8u>()) );\r
+}\r
+\r
+\r
+#endif /* !defined (HAVE_CUDA) */\r
+\r
+\r
+\r
+\r
+\r
+\r

diff --git a/tests/gpu/src/morf_filters.cpp b/tests/gpu/src/morf_filters.cpp
index 617430a..1f5c5a7 100644 (file)
--- a/tests/gpu/src/morf_filters.cpp
+++ b/tests/gpu/src/morf_filters.cpp
@@ -133,7 +133,7 @@ public:
 protected:
        virtual int test(const Mat& img)
     {
-        Mat kernel(3, 3, CV_8U, Scalar(1));
+        GpuMat kernel(Mat::ones(3, 3, CV_8U));
         Point anchor(1,1);
         int iters = 3;
 
@@ -157,7 +157,7 @@ public:
 protected:
        virtual int test(const Mat& img)
     {
-        Mat kernel(3, 3, CV_8U, Scalar(1));
+        GpuMat kernel(Mat::ones(3, 3, CV_8U));
         Point anchor(1,1);
         int iters = 3;
 
@@ -185,7 +185,7 @@ protected:
         const char *names[] = { "MORPH_OPEN", "CV_MOP_CLOSE", "CV_MOP_GRADIENT", "CV_MOP_TOPHAT", "CV_MOP_BLACKHAT"};
         int num = sizeof(ops)/sizeof(ops[0]);
 
-        Mat kernel(3, 3, CV_8U, Scalar(1));
+        GpuMat kernel(Mat::ones(3, 3, CV_8U));
         Point anchor(1,1);
         int iters = 3;