Merge pull request #12503 from nikhedonia:12500-move-gcgraph

* feat: move gcgraph to detail * chore: puts gcgraph cv::detail namespace
opencv · Sep 17, 2018 · e628fd7 · e628fd7
1 parent 808ba55
commit e628fd7
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/modules/imgproc/src/gcgraph.hpp → ...nclude/opencv2/imgproc/detail/gcgraph.hpp b/modules/imgproc/src/gcgraph.hpp → ...nclude/opencv2/imgproc/detail/gcgraph.hpp
@@ -39,9 +39,12 @@
 //
 //M*/
 
-#ifndef _CV_GCGRAPH_H_
-#define _CV_GCGRAPH_H_
+#ifndef OPENCV_IMGPROC_DETAIL_GCGRAPH_HPP
+#define OPENCV_IMGPROC_DETAIL_GCGRAPH_HPP
 
+//! @cond IGNORED
+
+namespace cv { namespace detail {
 template <class TWeight> class GCGraph
 {
 public:
@@ -382,4 +385,9 @@ bool GCGraph<TWeight>::inSourceSegment( int i )
     return vtcs[i].t == 0;
 }
 
-#endif
+}} // namespace detail, cv
+
+
+//! @endcond
+
+#endif  // OPENCV_IMGPROC_DETAIL_GCGRAPH_HPP
diff --git a/modules/imgproc/src/grabcut.cpp b/modules/imgproc/src/grabcut.cpp
@@ -40,10 +40,11 @@
 //M*/
 
 #include "precomp.hpp"
-#include "gcgraph.hpp"
+#include "opencv2/imgproc/detail/gcgraph.hpp"
 #include <limits>
 
 using namespace cv;
+using namespace detail;
 
 /*
 This is implementation of image segmentation algorithm GrabCut described in

diff --git a/modules/stitching/src/precomp.hpp b/modules/stitching/src/precomp.hpp
@@ -91,8 +91,6 @@
 #  include "opencv2/xfeatures2d/cuda.hpp"
 #endif
 
-#include "../../imgproc/src/gcgraph.hpp"
-
 #include "opencv2/core/private.hpp"
 
 #include "util_log.hpp"

diff --git a/modules/stitching/src/seam_finders.cpp b/modules/stitching/src/seam_finders.cpp
@@ -41,6 +41,7 @@
 //M*/
 
 #include "precomp.hpp"
+#include "opencv2/imgproc/detail/gcgraph.hpp"
 #include <map>
 
 namespace cv {