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

Replaced dynamic_cas with Ptr::dynamicCast<>, and & with &&

Browse Source
This commit is contained in:
Juan Manuel Perez
2013-09-25 18:30:33 +02:00
committed by Vadim Pisarevsky
parent 1bf4298251
commit 4672a70c1f
5 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/shape/src/haus_dis.cpp
View File

@@ -71,7 +71,7 @@ public:
virtual void setRankProportion(float _rankProportion)
{
CV_Assert((_rankProportion>0) & (_rankProportion<=1));
CV_Assert((_rankProportion>0) && (_rankProportion<=1));
rankProportion=_rankProportion;
}
virtual float getRankProportion() const {return rankProportion;}
@@ -135,8 +135,8 @@ float HausdorffDistanceExtractorImpl::computeDistance(InputArray contour1, Input
set1.convertTo(set1, CV_32F);
if (set2.type() != CV_32F)
set2.convertTo(set2, CV_32F);
CV_Assert((set1.channels()==2) & (set1.cols>0));
CV_Assert((set2.channels()==2) & (set2.cols>0));
CV_Assert((set1.channels()==2) && (set1.cols>0));
CV_Assert((set2.channels()==2) && (set2.cols>0));
return std::max( _apply(set1, set2, distanceFlag, rankProportion),
_apply(set2, set1, distanceFlag, rankProportion) );
}