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

pull/12988/head
Alexander Alekhin 6 years ago
commit 853f5111c2
  1. 5
      modules/calib3d/src/calibration.cpp

@ -3330,7 +3330,7 @@ namespace cv
static void collectCalibrationData( InputArrayOfArrays objectPoints, static void collectCalibrationData( InputArrayOfArrays objectPoints,
InputArrayOfArrays imagePoints1, InputArrayOfArrays imagePoints1,
InputArrayOfArrays imagePoints2, InputArrayOfArrays imagePoints2,
int& iFixedPoint, int iFixedPoint,
Mat& objPtMat, Mat& imgPtMat1, Mat* imgPtMat2, Mat& objPtMat, Mat& imgPtMat1, Mat* imgPtMat2,
Mat& npoints ) Mat& npoints )
{ {
@ -3419,8 +3419,7 @@ static void collectCalibrationData( InputArrayOfArrays objectPoints,
Mat& objPtMat, Mat& imgPtMat1, Mat* imgPtMat2, Mat& objPtMat, Mat& imgPtMat1, Mat* imgPtMat2,
Mat& npoints ) Mat& npoints )
{ {
int iFixedPoint = -1; collectCalibrationData( objectPoints, imagePoints1, imagePoints2, -1, objPtMat, imgPtMat1,
collectCalibrationData( objectPoints, imagePoints1, imagePoints2, iFixedPoint, objPtMat, imgPtMat1,
imgPtMat2, npoints ); imgPtMat2, npoints );
} }

Loading…
Cancel
Save