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

overload instead of default arg for ABI backwards compatibility. rng_seed is now 'int' to support python port

Browse Source
This commit is contained in:
Vijay Pradeep
2015-01-09 10:17:18 -08:00
parent a1c5740044
commit 177478a8ad
2 changed files with 28 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
modules/calib3d/src/solvepnp.cpp
View File

@@ -303,7 +303,7 @@ void cv::solvePnPRansac(InputArray _opoints, InputArray _ipoints,
InputArray _cameraMatrix, InputArray _distCoeffs,
OutputArray _rvec, OutputArray _tvec, bool useExtrinsicGuess,
int iterationsCount, float reprojectionError, int minInliersCount,
OutputArray _inliers, int flags, uint64 _rng_seed)
OutputArray _inliers, int flags, int _rng_seed)
{
Mat opoints = _opoints.getMat(), ipoints = _ipoints.getMat();
Mat cameraMatrix = _cameraMatrix.getMat(), distCoeffs = _distCoeffs.getMat();
@@ -376,3 +376,14 @@ void cv::solvePnPRansac(InputArray _opoints, InputArray _ipoints,
}
return;
}
void cv::solvePnPRansac(InputArray _opoints, InputArray _ipoints,
InputArray _cameraMatrix, InputArray _distCoeffs,
OutputArray _rvec, OutputArray _tvec, bool useExtrinsicGuess,
int iterationsCount, float reprojectionError, int minInliersCount,
OutputArray _inliers, int flags)
{
solvePnPRansac(_opoints, _ipoints, _cameraMatrix, _distCoeffs,
_rvec, _tvec, useExtrinsicGuess, iterationsCount,
reprojectionError, minInliersCount, _inliers, flags, 0);
}