From c9abb823a72a7ac9f2cc7877c03bac252e89ddcc Mon Sep 17 00:00:00 2001
From: Wenfeng CAI <xoxyzox-m@yahoo.com>
Date: Mon, 29 Oct 2018 10:19:02 +0800
Subject: [PATCH] Fix signature of static collectCalibrationData()

This is a fix to the signature of static function
collectCalibrationData() and clean-up for #12772. Since fallback scheme
in calibration method selection is not used anymore. As an input
parameter, iFixedPoint should be passed by value according to the OpenCV
coding style guide.
---
 modules/calib3d/src/calibration.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/calib3d/src/calibration.cpp b/modules/calib3d/src/calibration.cpp
index f83adf8f81..df1a536cb7 100644
--- 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, iFixedPoint, objPtMat, imgPtMat1,
+    collectCalibrationData( objectPoints, imagePoints1, imagePoints2, -1, objPtMat, imgPtMat1,
                             imgPtMat2, npoints );
 }