Merge pull request #3519 from fvgoto:patch-1

This commit is contained in:
Vadim Pisarevsky 2014-12-22 10:25:00 +00:00
commit 199f1aec2e

View File

@ -199,7 +199,7 @@ float ShapeContextDistanceExtractorImpl::computeDistance(InputArray contour1, In
if (set2.type() != CV_32F)
sset2.convertTo(set2, CV_32F);
else
sset1.copyTo(set2);
sset2.copyTo(set2);
CV_Assert((set1.channels()==2) && (set1.cols>0));
CV_Assert((set2.channels()==2) && (set2.cols>0));