From 49bc100e51dcc02a65492b14a924ea31281c4626 Mon Sep 17 00:00:00 2001 From: Vijay Pradeep Date: Tue, 17 Feb 2015 09:19:22 -0800 Subject: [PATCH] Removing rng_seed arg in order to maintain ABI compatibility. Hardcoding seed --- modules/calib3d/include/opencv2/calib3d/calib3d.hpp | 3 +-- modules/calib3d/src/solvepnp.cpp | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/calib3d/include/opencv2/calib3d/calib3d.hpp b/modules/calib3d/include/opencv2/calib3d/calib3d.hpp index bd579e8..5e9cde8 100644 --- a/modules/calib3d/include/opencv2/calib3d/calib3d.hpp +++ b/modules/calib3d/include/opencv2/calib3d/calib3d.hpp @@ -488,8 +488,7 @@ CV_EXPORTS_W void solvePnPRansac( InputArray objectPoints, float reprojectionError = 8.0, int minInliersCount = 100, OutputArray inliers = noArray(), - int flags = ITERATIVE, - int rng_seed = 0); + int flags = ITERATIVE); //! initializes camera matrix from a few 3D points and the corresponding projections. CV_EXPORTS_W Mat initCameraMatrix2D( InputArrayOfArrays objectPoints, diff --git a/modules/calib3d/src/solvepnp.cpp b/modules/calib3d/src/solvepnp.cpp index 44e6aaa..be58703 100644 --- a/modules/calib3d/src/solvepnp.cpp +++ b/modules/calib3d/src/solvepnp.cpp @@ -303,8 +303,9 @@ 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, int _rng_seed) + OutputArray _inliers, int flags) { + const int _rng_seed = 0; Mat opoints = _opoints.getMat(), ipoints = _ipoints.getMat(); Mat cameraMatrix = _cameraMatrix.getMat(), distCoeffs = _distCoeffs.getMat(); -- 2.7.4