diff --git a/apps/interactive-calibration/calibController.cpp b/apps/interactive-calibration/calibController.cpp index b2e5b87106..7cb9857a4c 100644 --- a/apps/interactive-calibration/calibController.cpp +++ b/apps/interactive-calibration/calibController.cpp @@ -306,10 +306,10 @@ bool calib::calibDataController::saveCurrentCameraParameters() const parametersWriter << "calibrationDate" << buf; parametersWriter << "framesCount" << std::max((int)mCalibData->objectPoints.size(), (int)mCalibData->allCharucoCorners.size()); parametersWriter << "cameraResolution" << mCalibData->imageSize; - parametersWriter << "cameraMatrix" << mCalibData->cameraMatrix; - parametersWriter << "cameraMatrix_std_dev" << mCalibData->stdDeviations.rowRange(cv::Range(0, 4)); - parametersWriter << "dist_coeffs" << mCalibData->distCoeffs; - parametersWriter << "dist_coeffs_std_dev" << mCalibData->stdDeviations.rowRange(cv::Range(4, 9)); + parametersWriter << "camera_matrix" << mCalibData->cameraMatrix; + parametersWriter << "camera_matrix_std_dev" << mCalibData->stdDeviations.rowRange(cv::Range(0, 4)); + parametersWriter << "distortion_coefficients" << mCalibData->distCoeffs; + parametersWriter << "distortion_coefficients_std_dev" << mCalibData->stdDeviations.rowRange(cv::Range(4, 9)); parametersWriter << "avg_reprojection_error" << mCalibData->totalAvgErr; parametersWriter.release(); diff --git a/doc/tutorials/calib3d/interactive_calibration/interactive_calibration.markdown b/doc/tutorials/calib3d/interactive_calibration/interactive_calibration.markdown index 14db876933..10c121e3fc 100644 --- a/doc/tutorials/calib3d/interactive_calibration/interactive_calibration.markdown +++ b/doc/tutorials/calib3d/interactive_calibration/interactive_calibration.markdown @@ -180,34 +180,34 @@ Example of output XML file: 21 1280 720 - + 3 3
d
1.2519588293098975e+03 0. 6.6684948780852471e+02 0. - 1.2519588293098975e+03 3.6298123112613683e+02 0. 0. 1.
- + 1.2519588293098975e+03 3.6298123112613683e+02 0. 0. 1. + 4 1
d
0. 1.2887048808572649e+01 2.8536856683866230e+00 - 2.8341737483430314e+00
- + 2.8341737483430314e+00 + 1 5
d
1.3569117181595716e-01 -8.2513063822554633e-01 0. 0. - 1.6412101575010554e+00
- + 1.6412101575010554e+00 + 5 1
d
1.5570675523402111e-02 8.7229075437543435e-02 0. 0. - 1.8382427901856876e-01
+ 1.8382427901856876e-01 4.2691743074130178e-01 @endcode diff --git a/doc/tutorials/objdetect/aruco_board_detection/aruco_board_detection.markdown b/doc/tutorials/objdetect/aruco_board_detection/aruco_board_detection.markdown index 400891dfaa..352762a2b8 100644 --- a/doc/tutorials/objdetect/aruco_board_detection/aruco_board_detection.markdown +++ b/doc/tutorials/objdetect/aruco_board_detection/aruco_board_detection.markdown @@ -127,7 +127,7 @@ in ascending order starting on 0, so they will be 0, 1, 2, ..., 34. After creating a grid board, we probably want to print it and use it. There are two ways to do this: -1. By using the script `apps/pattern_tools/generate_pattern.py `, see @subpage tutorial_camera_calibration_pattern. +1. By using the script `apps/pattern-tools/generate_pattern.py`, see @subpage tutorial_camera_calibration_pattern. 2. By using the function `cv::aruco::GridBoard::generateImage()`. The function `cv::aruco::GridBoard::generateImage()` is provided in cv::aruco::GridBoard class and diff --git a/doc/tutorials/objdetect/charuco_detection/charuco_detection.markdown b/doc/tutorials/objdetect/charuco_detection/charuco_detection.markdown index 40fc331000..7ea0f39d23 100644 --- a/doc/tutorials/objdetect/charuco_detection/charuco_detection.markdown +++ b/doc/tutorials/objdetect/charuco_detection/charuco_detection.markdown @@ -77,7 +77,7 @@ through `board.ids`, like in the `cv::aruco::Board` parent class. Once we have our `cv::aruco::CharucoBoard` object, we can create an image to print it. There are two ways to do this: -1. By using the script `apps/pattern_tools/generate_pattern.py `, see @subpage tutorial_camera_calibration_pattern. +1. By using the script `apps/pattern-tools/generate_pattern.py`, see @subpage tutorial_camera_calibration_pattern. 2. By using the function `cv::aruco::CharucoBoard::generateImage()`. The function `cv::aruco::CharucoBoard::generateImage()` is provided in cv::aruco::CharucoBoard class