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

added overloaded variants of findHomography & findFundamentalMat for backward compatibility

Browse Source
This commit is contained in:
Vadim Pisarevsky 2011-04-23 12:49:14 +00:00
parent ee0c16e43e
commit 83efef4b9a
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/calib3d/include/opencv2/calib3d/calib3d.hpp
View File

@ -442,10 +442,13 @@ enum
}; };
//! computes the best-fit perspective transformation mapping srcPoints to dstPoints. //! computes the best-fit perspective transformation mapping srcPoints to dstPoints.
CV_EXPORTS_W Mat findHomography( const InputArray& srcPoints, CV_EXPORTS_W Mat findHomography( const InputArray& srcPoints, const InputArray& dstPoints,
const InputArray& dstPoints,
int method=0, double ransacReprojThreshold=3, int method=0, double ransacReprojThreshold=3,
OutputArray mask=OutputArray()); OutputArray mask=OutputArray());
//! variant of findHomography for backward compatibility
CV_EXPORTS Mat findHomography( const InputArray& srcPoints, const InputArray& dstPoints,
OutputArray mask, int method=0, double ransacReprojThreshold=3);
//! Computes RQ decomposition of 3x3 matrix //! Computes RQ decomposition of 3x3 matrix
CV_EXPORTS_W Vec3d RQDecomp3x3( const InputArray& src, OutputArray mtxR, OutputArray mtxQ, CV_EXPORTS_W Vec3d RQDecomp3x3( const InputArray& src, OutputArray mtxR, OutputArray mtxQ,
@ -640,6 +643,11 @@ CV_EXPORTS_W Mat findFundamentalMat( const InputArray& points1, const InputArray
double param1=3., double param2=0.99, double param1=3., double param2=0.99,
OutputArray mask=OutputArray()); OutputArray mask=OutputArray());
//! variant of findFundamentalMat for backward compatibility
CV_EXPORTS Mat findFundamentalMat( const InputArray& points1, const InputArray& points2,
OutputArray mask, int method=FM_RANSAC,
double param1=3., double param2=0.99);
//! finds coordinates of epipolar lines corresponding the specified points //! finds coordinates of epipolar lines corresponding the specified points
CV_EXPORTS void computeCorrespondEpilines( const InputArray& points1, CV_EXPORTS void computeCorrespondEpilines( const InputArray& points1,
int whichImage, const InputArray& F, int whichImage, const InputArray& F,

15
modules/calib3d/src/fundam.cpp
View File

@ -1065,7 +1065,13 @@ cv::Mat cv::findHomography( const InputArray& _points1, const InputArray& _point
H = Scalar(0); H = Scalar(0);
return H; return H;
} }
cv::Mat cv::findHomography( const InputArray& _points1, const InputArray& _points2,
OutputArray _mask, int method, double ransacReprojThreshold )
{
return cv::findHomography(_points1, _points2, method, ransacReprojThreshold, _mask);
}
cv::Mat cv::findFundamentalMat( const InputArray& _points1, const InputArray& _points2, cv::Mat cv::findFundamentalMat( const InputArray& _points1, const InputArray& _points2,
int method, double param1, double param2, int method, double param1, double param2,
OutputArray _mask ) OutputArray _mask )
@ -1089,6 +1095,13 @@ cv::Mat cv::findFundamentalMat( const InputArray& _points1, const InputArray& _p
return F; return F;
} }
cv::Mat cv::findFundamentalMat( const InputArray& _points1, const InputArray& _points2,
OutputArray _mask, int method, double param1, double param2 )
{
return cv::findFundamentalMat(_points1, _points2, method, param1, param2, _mask);
}
void cv::computeCorrespondEpilines( const InputArray& _points, int whichImage, void cv::computeCorrespondEpilines( const InputArray& _points, int whichImage,
const InputArray& _Fmat, OutputArray _lines ) const InputArray& _Fmat, OutputArray _lines )
{ {