Merge branch 'connected-components'

ogedaycengiz · Aug 6, 2012 · e15756d · e15756d
2 parents 50d13ba + 32a649c
commit e15756d
Show file tree

Hide file tree

Showing 6 changed files with 695 additions and 6 deletions.
diff --git a/doc/license.txt b/doc/license.txt
@@ -1,4 +1,4 @@
-IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING. 
+IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
 
  By downloading, copying, installing or using the software you agree to this license.
  If you do not agree to this license, do not download, install,

diff --git a/modules/gpu/include/opencv2/gpu/gpu.hpp b/modules/gpu/include/opencv2/gpu/gpu.hpp
@@ -917,6 +917,12 @@ CV_EXPORTS void graphcut(GpuMat& terminals, GpuMat& leftTransp, GpuMat& rightTra
                          GpuMat& labels,
                          GpuMat& buf, Stream& stream = Stream::Null());
 
+//! compute mask for Generalized Flood fill componetns labeling.
+CV_EXPORTS void connectivityMask(const GpuMat& image, GpuMat& mask, const cv::Scalar& lo, const cv::Scalar& hi, Stream& stream = Stream::Null());
+
+//! performs connected componnents labeling.
+CV_EXPORTS void labelComponents(const GpuMat& mask, GpuMat& components, Stream& stream = Stream::Null());
+
 ////////////////////////////////// Histograms //////////////////////////////////
 
 //! Compute levels with even distribution. levels will have 1 row and nLevels cols and CV_32SC1 type.