diff --git a/modules/imgproc/src/gcgraph.hpp b/modules/imgproc/include/opencv2/imgproc/detail/gcgraph.hpp similarity index 98% rename from modules/imgproc/src/gcgraph.hpp rename to modules/imgproc/include/opencv2/imgproc/detail/gcgraph.hpp index 16c25dea31..db2ea0f61d 100644 --- a/modules/imgproc/src/gcgraph.hpp +++ b/modules/imgproc/include/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 GCGraph { public: @@ -382,4 +385,9 @@ bool GCGraph::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 index 9cfbe0dd0e..d59117f745 100644 --- 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 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 index ef3740ed76..535cce5e68 100644 --- 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 index 1bc0e8e8e4..4a1f86a33d 100644 --- 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 namespace cv {