Skip to content

O
opencv
Commit e5d1b9ee authored by Vadim Pisarevsky's avatar Vadim Pisarevsky
Browse files
Options

another attempt to fix findHomography

parent 2d5a984c
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
modules/calib3d/src/fundam.cpp
View file @ e5d1b9ee
...@@ -260,10 +260,7 @@ cvFindHomography( const CvMat* objectPoints, const CvMat* imagePoints, ...@@ -260,10 +260,7 @@ cvFindHomography( const CvMat* objectPoints, const CvMat* imagePoints,
if( method == CV_LMEDS ) if( method == CV_LMEDS )
result = estimator.runLMeDS( M, m, &matH, tempMask, confidence, maxIters ); result = estimator.runLMeDS( M, m, &matH, tempMask, confidence, maxIters );
else if( method == CV_RANSAC ) else if( method == CV_RANSAC )
{
result = estimator.runRANSAC( M, m, &matH, tempMask, ransacReprojThreshold, confidence, maxIters); result = estimator.runRANSAC( M, m, &matH, tempMask, ransacReprojThreshold, confidence, maxIters);
estimator.runKernel( M, m, &matH );
}
else else
result = estimator.runKernel( M, m, &matH ) > 0; result = estimator.runKernel( M, m, &matH ) > 0;
...@@ -272,6 +269,8 @@ cvFindHomography( const CvMat* objectPoints, const CvMat* imagePoints, ...@@ -272,6 +269,8 @@ cvFindHomography( const CvMat* objectPoints, const CvMat* imagePoints,
icvCompressPoints( (CvPoint2D64f*)M->data.ptr, tempMask->data.ptr, 1, count ); icvCompressPoints( (CvPoint2D64f*)M->data.ptr, tempMask->data.ptr, 1, count );
count = icvCompressPoints( (CvPoint2D64f*)m->data.ptr, tempMask->data.ptr, 1, count ); count = icvCompressPoints( (CvPoint2D64f*)m->data.ptr, tempMask->data.ptr, 1, count );
M->cols = m->cols = count; M->cols = m->cols = count;
if( method == CV_RANSAC )
estimator.runKernel( M, m, &matH );
estimator.refine( M, m, &matH, 10 ); estimator.refine( M, m, &matH, 10 );
} }
......
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