Now using default arg instead of overloads
authorVijay Pradeep <vijaypradeep@google.com>
Tue, 13 Jan 2015 19:25:01 +0000 (11:25 -0800)
committerVijay Pradeep <vijaypradeep@google.com>
Tue, 13 Jan 2015 19:25:01 +0000 (11:25 -0800)
modules/calib3d/include/opencv2/calib3d/calib3d.hpp
modules/calib3d/src/solvepnp.cpp

index ce26561..bd579e8 100644 (file)
@@ -488,22 +488,8 @@ CV_EXPORTS_W void solvePnPRansac( InputArray objectPoints,
                                   float reprojectionError = 8.0,
                                   int minInliersCount = 100,
                                   OutputArray inliers = noArray(),
-                                  int flags = ITERATIVE);
-
-//! computes the camera pose from a few 3D points and the corresponding projections. The outliers are possible.
-CV_EXPORTS_W void solvePnPRansac( InputArray objectPoints,
-                                  InputArray imagePoints,
-                                  InputArray cameraMatrix,
-                                  InputArray distCoeffs,
-                                  OutputArray rvec,
-                                  OutputArray tvec,
-                                  bool useExtrinsicGuess,
-                                  int iterationsCount,
-                                  float reprojectionError,
-                                  int minInliersCount,
-                                  OutputArray inliers,
-                                  int flags,
-                                  int rng_seed);
+                                  int flags = ITERATIVE,
+                                  int rng_seed = 0);
 
 //! initializes camera matrix from a few 3D points and the corresponding projections.
 CV_EXPORTS_W Mat initCameraMatrix2D( InputArrayOfArrays objectPoints,
index bae05d9..44e6aaa 100644 (file)
@@ -376,14 +376,3 @@ 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);
-}