mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-29 13:47:32 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add check for all zero moments. If one of the shapes is empty, the match would return zero distance between the shapes even when the other one had content. It now returns DBL_MAX if no moments had value.

Browse Source
This commit is contained in:
Tetragramm 2017-01-04 18:38:46 -06:00
parent 9be630466f
commit d33d37ffd9
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/imgproc/src/matchcontours.cpp
View File

@ -50,6 +50,7 @@ double cv::matchShapes(InputArray contour1, InputArray contour2, int method, dou
double eps = 1.e-5;
double mmm;
double result = 0;
bool anyResults = false;
HuMoments( moments(contour1), ma );
HuMoments( moments(contour2), mb );
@ -80,6 +81,7 @@ double cv::matchShapes(InputArray contour1, InputArray contour2, int method, dou
ama = 1. / (sma * log10( ama ));
amb = 1. / (smb * log10( amb ));
result += fabs( -ama + amb );
anyResults = true;
}
}
break;
@ -108,6 +110,7 @@ double cv::matchShapes(InputArray contour1, InputArray contour2, int method, dou
ama = sma * log10( ama );
amb = smb * log10( amb );
result += fabs( -ama + amb );
anyResults = true;
}
}
break;
@ -138,6 +141,7 @@ double cv::matchShapes(InputArray contour1, InputArray contour2, int method, dou
mmm = fabs( (ama - amb) / ama );
if( result < mmm )
result = mmm;
anyResults = true;
}
}
break;
@ -145,6 +149,9 @@ double cv::matchShapes(InputArray contour1, InputArray contour2, int method, dou
CV_Error( CV_StsBadArg, "Unknown comparison method" );
}
if (!anyResults)
result = DBL_MAX;
return result;
}