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

applied patch from #1655 (thanks to Changbo Zhou!)

Browse Source
This commit is contained in:
Vadim Pisarevsky 2012-03-26 08:18:10 +00:00
parent 69f5d8c1d3
commit e778007d5d
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/contrib/src/chamfermatching.cpp
View File

@ -952,20 +952,18 @@ void ChamferMatcher::Matching::computeDistanceTransform(Mat& edges_img, Mat& dis
// set distance to the edge pixels to 0 and put them in the queue // set distance to the edge pixels to 0 and put them in the queue
std::queue<std::pair<int,int> > q; std::queue<std::pair<int,int> > q;
for (int y=0;y<h;++y) { for (int y=0;y<h;++y) {
for (int x=0;x<w;++x) { for (int x=0;x<w;++x) {
// initialize
unsigned char edge_val = edges_img.at<uchar>(y,x);
if ( (edge_val!=0) ) {
q.push(std::make_pair(x,y));
dist_img.at<float>(y,x)= 0;
if (&annotate_img!=NULL) { if (&annotate_img!=NULL) {
annotate_img.at<Vec2i>(y,x)[0]=x; annotate_img.at<Vec2i>(y,x)[0]=x;
annotate_img.at<Vec2i>(y,x)[1]=y; annotate_img.at<Vec2i>(y,x)[1]=y;
} }
uchar edge_val = edges_img.at<uchar>(y,x);
if( (edge_val!=0) ) {
q.push(std::make_pair(x,y));
dist_img.at<float>(y,x)= 0;
} }
else { else {
dist_img.at<float>(y,x)=-1; dist_img.at<float>(y,x)=-1;