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

fixed failure of the C++ test for estimateAffine3D

Browse Source
This commit is contained in:
Vadim Pisarevsky 2013-01-31 19:44:16 +04:00
parent 79e278c008
commit 7ca38d63d9
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/calib3d/src/modelest.cpp
View File

@ -467,10 +467,8 @@ 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();
_inliers.create(count, 1, CV_8U); Mat inliers(1, count, CV_8U);
Mat inliers = _inliers.getMat();
inliers = Scalar::all(1); inliers = Scalar::all(1);
transpose(inliers, inliers);
Mat dFrom, dTo; Mat dFrom, dTo;
from.convertTo(dFrom, CV_64F); from.convertTo(dFrom, CV_64F);
@ -487,5 +485,9 @@ int cv::estimateAffine3D(InputArray _from, InputArray _to,
param1 = param1 <= 0 ? 3 : param1; param1 = param1 <= 0 ? 3 : param1;
param2 = (param2 < epsilon) ? 0.99 : (param2 > 1 - epsilon) ? 0.99 : param2; param2 = (param2 < epsilon) ? 0.99 : (param2 > 1 - epsilon) ? 0.99 : param2;
return Affine3DEstimator().runRANSAC(&m1, &m2, &F3x4, &mask, param1, param2 ); int ok = Affine3DEstimator().runRANSAC(&m1, &m2, &F3x4, &mask, param1, param2 );
if( _inliers.needed() )
transpose(inliers, _inliers);
return ok;
} }

8
modules/core/src/matrix.cpp
View File

@ -1927,6 +1927,14 @@ void cv::transpose( InputArray _src, OutputArray _dst )
_dst.create(src.cols, src.rows, src.type()); _dst.create(src.cols, src.rows, src.type());
Mat dst = _dst.getMat(); Mat dst = _dst.getMat();
// handle the case of single-column/single-row matrices, stored in STL vectors.
if( src.rows != dst.cols || src.cols != dst.rows )
{
CV_Assert( src.cols == 1 || src.rows == 1 );
src.copyTo(dst);
return;
}
if( dst.data == src.data ) if( dst.data == src.data )
{ {
TransposeInplaceFunc func = transposeInplaceTab[esz]; TransposeInplaceFunc func = transposeInplaceTab[esz];