generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

added DIST_LABEL_PIXEL labelType to distanceTransform, ticket #1641 (thanks to Mikhail Matrosov for the patch)

Browse Source
This commit is contained in:
Vadim Pisarevsky
2012-03-27 09:06:21 +00:00
parent f70d171cef
commit e8fab91d51
6 changed files with 94 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
View File

@@ -751,9 +751,16 @@ CV_EXPORTS_W void grabCut( InputArray img, InputOutputArray mask, Rect rect,
InputOutputArray bgdModel, InputOutputArray fgdModel,
int iterCount, int mode = GC_EVAL );
enum
{
DIST_LABEL_CCOMP = 0,
DIST_LABEL_PIXEL = 1
};
//! builds the discrete Voronoi diagram
CV_EXPORTS_AS(distanceTransformWithLabels) void distanceTransform( InputArray src, OutputArray dst,
OutputArray labels, int distanceType, int maskSize );
OutputArray labels, int distanceType, int maskSize,
int labelType=DIST_LABEL_CCOMP );
//! computes the distance transform map
CV_EXPORTS_W void distanceTransform( InputArray src, OutputArray dst,

3
modules/imgproc/include/opencv2/imgproc/imgproc_c.h
View File

@@ -620,7 +620,8 @@ CVAPI(void) cvDistTransform( const CvArr* src, CvArr* dst,
int distance_type CV_DEFAULT(CV_DIST_L2),
int mask_size CV_DEFAULT(3),
const float* mask CV_DEFAULT(NULL),
CvArr* labels CV_DEFAULT(NULL));
CvArr* labels CV_DEFAULT(NULL),
int labelType CV_DEFAULT(CV_DIST_LABEL_CCOMP));
/* Applies fixed-level threshold to grayscale image.

7
modules/imgproc/include/opencv2/imgproc/types_c.h
View File

@@ -470,6 +470,13 @@ enum
CV_DIST_MASK_PRECISE =0
};
/* Content of output label array: connected components or pixels */
enum
{
CV_DIST_LABEL_CCOMP = 0,
CV_DIST_LABEL_PIXEL = 1
};
/* Distance types for Distance Transform and M-estimators */
enum
{