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

4
modules/shape/src/tps_trans.cpp
View File

@@ -169,7 +169,7 @@ float ThinPlateSplineShapeTransformerImpl::applyTransformation(InputArray inPts,
{
CV_Assert(tpsComputed);
Mat pts1 = inPts.getMat();
CV_Assert((pts1.channels()==2) & (pts1.cols>0));
CV_Assert((pts1.channels()==2) && (pts1.cols>0));
//Apply transformation in the complete set of points
// Ensambling output //
@@ -192,7 +192,7 @@ void ThinPlateSplineShapeTransformerImpl::estimateTransformation(InputArray _pts
{
Mat pts1 = _pts1.getMat();
Mat pts2 = _pts2.getMat();
CV_Assert((pts1.channels()==2) & (pts1.cols>0) & (pts2.channels()==2) & (pts2.cols>0));
CV_Assert((pts1.channels()==2) && (pts1.cols>0) && (pts2.channels()==2) && (pts2.cols>0));
CV_Assert(_matches.size()>1);
if (pts1.type() != CV_32F)