mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-08 01:53:19 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix signature of static collectCalibrationData()

Browse Source 
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.
This commit is contained in:
Wenfeng CAI 2018-10-29 10:19:02 +08:00
parent e6dd9a78ae
commit c9abb823a7
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/calib3d/src/calibration.cpp
View File

@ -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 );
} }