Merge pull request #12978 from xoox:fix-collectCalibrationData-signature

853f5111 · Alexander Alekhin · 65ab6ed5 · c9abb823 · 853f5111
Commit 853f5111 authored Oct 29, 2018 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

calibration.cpp modules/calib3d/src/calibration.cpp +2 -3

No files found.
--- a/modules/calib3d/src/calibration.cpp
+++ b/modules/calib3d/src/calibration.cpp
@@ -3330,7 +3330,7 @@ namespace cv
 static void collectCalibrationData( InputArrayOfArrays objectPoints,
                                    InputArrayOfArrays imagePoints1,
                                    InputArrayOfArrays imagePoints2,
-                                    int& iFixedPoint,
+                                    int iFixedPoint,
                                    Mat& objPtMat, Mat& imgPtMat1, Mat* imgPtMat2,
                                    Mat& npoints )
 {
@@ -3419,8 +3419,7 @@ static void collectCalibrationData( InputArrayOfArrays objectPoints,
                                    Mat& objPtMat, Mat& imgPtMat1, Mat* imgPtMat2,
                                    Mat& npoints )
 {
-    int iFixedPoint = -1;
+    collectCalibrationData( objectPoints, imagePoints1, imagePoints2, -1, objPtMat, imgPtMat1,
-    collectCalibrationData( objectPoints, imagePoints1, imagePoints2, iFixedPoint, objPtMat, imgPtMat1,
                            imgPtMat2, npoints );
 }