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

* feat: move gcgraph to detail

* chore: puts gcgraph cv::detail namespace
pull/12547/merge
Gaetano Checinski 6 years ago committed by Alexander Alekhin
parent 808ba552c5
commit e628fd7bce
  1. 14
      modules/imgproc/include/opencv2/imgproc/detail/gcgraph.hpp
  2. 3
      modules/imgproc/src/grabcut.cpp
  3. 2
      modules/stitching/src/precomp.hpp
  4. 1
      modules/stitching/src/seam_finders.cpp

@ -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

@ -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

@ -91,8 +91,6 @@
# include "opencv2/xfeatures2d/cuda.hpp"
#endif
#include "../../imgproc/src/gcgraph.hpp"
#include "opencv2/core/private.hpp"
#include "util_log.hpp"

@ -41,6 +41,7 @@
//M*/
#include "precomp.hpp"
#include "opencv2/imgproc/detail/gcgraph.hpp"
#include <map>
namespace cv {

Loading…
Cancel
Save