Commit e628fd7b authored by Gaetano Checinski's avatar Gaetano Checinski Committed by Alexander Alekhin

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

* feat: move gcgraph to detail

* chore: puts gcgraph cv::detail namespace
parent 808ba552
...@@ -39,9 +39,12 @@ ...@@ -39,9 +39,12 @@
// //
//M*/ //M*/
#ifndef _CV_GCGRAPH_H_ #ifndef OPENCV_IMGPROC_DETAIL_GCGRAPH_HPP
#define _CV_GCGRAPH_H_ #define OPENCV_IMGPROC_DETAIL_GCGRAPH_HPP
//! @cond IGNORED
namespace cv { namespace detail {
template <class TWeight> class GCGraph template <class TWeight> class GCGraph
{ {
public: public:
...@@ -382,4 +385,9 @@ bool GCGraph<TWeight>::inSourceSegment( int i ) ...@@ -382,4 +385,9 @@ bool GCGraph<TWeight>::inSourceSegment( int i )
return vtcs[i].t == 0; return vtcs[i].t == 0;
} }
#endif }} // namespace detail, cv
//! @endcond
#endif // OPENCV_IMGPROC_DETAIL_GCGRAPH_HPP
...@@ -40,10 +40,11 @@ ...@@ -40,10 +40,11 @@
//M*/ //M*/
#include "precomp.hpp" #include "precomp.hpp"
#include "gcgraph.hpp" #include "opencv2/imgproc/detail/gcgraph.hpp"
#include <limits> #include <limits>
using namespace cv; using namespace cv;
using namespace detail;
/* /*
This is implementation of image segmentation algorithm GrabCut described in This is implementation of image segmentation algorithm GrabCut described in
......
...@@ -91,8 +91,6 @@ ...@@ -91,8 +91,6 @@
# include "opencv2/xfeatures2d/cuda.hpp" # include "opencv2/xfeatures2d/cuda.hpp"
#endif #endif
#include "../../imgproc/src/gcgraph.hpp"
#include "opencv2/core/private.hpp" #include "opencv2/core/private.hpp"
#include "util_log.hpp" #include "util_log.hpp"
......
...@@ -41,6 +41,7 @@ ...@@ -41,6 +41,7 @@
//M*/ //M*/
#include "precomp.hpp" #include "precomp.hpp"
#include "opencv2/imgproc/detail/gcgraph.hpp"
#include <map> #include <map>
namespace cv { namespace cv {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment