mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-01-21 08:37:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed bug #1531. added separate distanceTransformWithLabels function that returns labels, since normally the labels are not needed.

Browse Source
This commit is contained in:
Vadim Pisarevsky 2012-01-25 12:17:59 +00:00
parent 82ae0b2c0c
commit 4f86af7e16
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -758,12 +758,12 @@ CV_EXPORTS_W void inpaint( InputArray src, InputArray inpaintMask,
OutputArray dst, double inpaintRange, int flags );
//! builds the discrete Voronoi diagram
CV_EXPORTS_W void distanceTransform( InputArray src, OutputArray dst,
CV_EXPORTS_AS(distanceTransformWithLabels) void distanceTransform( InputArray src, OutputArray dst,
OutputArray labels, int distanceType, int maskSize );
//! computes the distance transform map
CV_EXPORTS void distanceTransform( InputArray src, OutputArray dst,
int distanceType, int maskSize );
CV_EXPORTS_W void distanceTransform( InputArray src, OutputArray dst,
int distanceType, int maskSize );
enum { FLOODFILL_FIXED_RANGE = 1 << 16, FLOODFILL_MASK_ONLY = 1 << 17 };

15
modules/imgproc/src/distransform.cpp
View File

@ -826,14 +826,14 @@ cvDistTransform( const void* srcarr, void* dstarr,
else
{
CvSeq *contours = 0;
CvPoint top_left = {0,0}, bottom_right = {size.width-1,size.height-1};
int label;
st = cvCreateMemStorage();
src_copy = cvCreateMat( size.height, size.width, src->type );
cvCmpS( src, 0, src_copy, CV_CMP_EQ );
src_copy = cvCreateMat( size.height+border*2, size.width+border*2, src->type );
cvCopyMakeBorder(src, src_copy, cvPoint(border, border), IPL_BORDER_CONSTANT, cvScalarAll(255));
cvCmpS( src_copy, 0, src_copy, CV_CMP_EQ );
cvFindContours( src_copy, st, &contours, sizeof(CvContour),
CV_RETR_CCOMP, CV_CHAIN_APPROX_SIMPLE );
CV_RETR_CCOMP, CV_CHAIN_APPROX_SIMPLE, cvPoint(-border, -border));
cvZero( labels );
for( label = 1; contours != 0; contours = contours->h_next, label++ )
{
@ -841,10 +841,11 @@ cvDistTransform( const void* srcarr, void* dstarr,
cvDrawContours( labels, contours, area_color, area_color, -255, -1, 8 );
}
cvCopy( src, src_copy );
cvRectangle( src_copy, top_left, bottom_right, cvScalarAll(255), 1, 8 );
//cvCopy( src, src_copy );
//CvPoint top_left = {0,0}, bottom_right = {size.width-1,size.height-1};
//cvRectangle( src_copy, top_left, bottom_right, cvScalarAll(255), 1, 8 );
icvDistanceTransformEx_5x5_C1R( src_copy->data.ptr, src_copy->step, temp->data.i, temp->step,
icvDistanceTransformEx_5x5_C1R( src->data.ptr, src->step, temp->data.i, temp->step,
dst->data.fl, dst->step, labels->data.i, labels->step, size, _mask );
}
}