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.
pull/12978/head
Wenfeng CAI 6 years ago
parent e6dd9a78ae
commit c9abb823a7
  1. 5
      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 );
}

Loading…
Cancel
Save