Commit 6229af93 authored by Vadim Pisarevsky's avatar Vadim Pisarevsky

corrected estimateAffine3D parameter name: outliers=>inliers (ticket #1141)

parent 9b6d8c39
...@@ -749,7 +749,7 @@ CV_EXPORTS_W void reprojectImageTo3D( InputArray disparity, ...@@ -749,7 +749,7 @@ CV_EXPORTS_W void reprojectImageTo3D( InputArray disparity,
int ddepth=-1 ); int ddepth=-1 );
CV_EXPORTS_W int estimateAffine3D(InputArray _from, InputArray _to, CV_EXPORTS_W int estimateAffine3D(InputArray _from, InputArray _to,
OutputArray _out, OutputArray _outliers, OutputArray _out, OutputArray _inliers,
double param1=3, double param2=0.99); double param1=3, double param2=0.99);
} }
......
...@@ -453,7 +453,7 @@ bool cv::Affine3DEstimator::checkSubset( const CvMat* ms1, int count ) ...@@ -453,7 +453,7 @@ bool cv::Affine3DEstimator::checkSubset( const CvMat* ms1, int count )
} }
int cv::estimateAffine3D(InputArray _from, InputArray _to, int cv::estimateAffine3D(InputArray _from, InputArray _to,
OutputArray _out, OutputArray _outliers, OutputArray _out, OutputArray _inliers,
double param1, double param2) double param1, double param2)
{ {
Mat from = _from.getMat(), to = _to.getMat(); Mat from = _from.getMat(), to = _to.getMat();
...@@ -464,16 +464,16 @@ int cv::estimateAffine3D(InputArray _from, InputArray _to, ...@@ -464,16 +464,16 @@ int cv::estimateAffine3D(InputArray _from, InputArray _to,
_out.create(3, 4, CV_64F); _out.create(3, 4, CV_64F);
Mat out = _out.getMat(); Mat out = _out.getMat();
_outliers.create(count, 1, CV_8U, -1, true); _inliers.create(count, 1, CV_8U, -1, true);
Mat outliers = _outliers.getMat(); Mat inliers = _inliers.getMat();
outliers = Scalar::all(1); inliers = Scalar::all(1);
Mat dFrom, dTo; Mat dFrom, dTo;
from.convertTo(dFrom, CV_64F); from.convertTo(dFrom, CV_64F);
to.convertTo(dTo, CV_64F); to.convertTo(dTo, CV_64F);
CvMat F3x4 = out; CvMat F3x4 = out;
CvMat mask = outliers; CvMat mask = inliers;
CvMat m1 = dFrom; CvMat m1 = dFrom;
CvMat m2 = dTo; CvMat m2 = dTo;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment