Skip to content

O
opencv
Commit 908978d0 authored by Alexander Alekhin's avatar Alexander Alekhin
Browse files
Options

Merge pull request #12589 from xoox:fix-stddev-request

parents 879e046b fce75cd8
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
modules/calib3d/src/calibration.cpp
View file @ 908978d0
...@@ -3426,7 +3426,8 @@ double cv::calibrateCamera(InputArrayOfArrays _objectPoints, ...@@ -3426,7 +3426,8 @@ double cv::calibrateCamera(InputArrayOfArrays _objectPoints,
tvecM = _tvecs.getMat(); tvecM = _tvecs.getMat();
} }
if( stddev_needed || stddev_ext_needed ) bool stddev_any_needed = stddev_needed || stddev_ext_needed;
if( stddev_any_needed )
{ {
stdDeviationsM.create(nimages*6 + CV_CALIB_NINTRINSIC, 1, CV_64F); stdDeviationsM.create(nimages*6 + CV_CALIB_NINTRINSIC, 1, CV_64F);
} }
...@@ -3447,7 +3448,7 @@ double cv::calibrateCamera(InputArrayOfArrays _objectPoints, ...@@ -3447,7 +3448,7 @@ double cv::calibrateCamera(InputArrayOfArrays _objectPoints,
&c_cameraMatrix, &c_distCoeffs, &c_cameraMatrix, &c_distCoeffs,
rvecs_needed ? &c_rvecM : NULL, rvecs_needed ? &c_rvecM : NULL,
tvecs_needed ? &c_tvecM : NULL, tvecs_needed ? &c_tvecM : NULL,
stddev_needed ? &c_stdDev : NULL, stddev_any_needed ? &c_stdDev : NULL,
errors_needed ? &c_errors : NULL, flags, cvTermCriteria(criteria)); errors_needed ? &c_errors : NULL, flags, cvTermCriteria(criteria));
if( stddev_needed ) if( stddev_needed )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment