Chiebot-Mirror
/
opencv
mirror of https://github.com/opencv/opencv.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1458 from look4pritam:my-branch

Browse Source
pull/1465/merge
Alexander Smorkalov 12 years ago committed by OpenCV Buildbot
parent ad404ef44f a430abd02e
commit 3fa3722641
1 changed files with 3 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      modules/calib3d/src/calibration.cpp

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

@ -1403,6 +1403,8 @@ CV_IMPL double cvCalibrateCamera2( const CvMat* objectPoints,
} }
if( !(flags & CV_CALIB_RATIONAL_MODEL) ) if( !(flags & CV_CALIB_RATIONAL_MODEL) )
flags |= CV_CALIB_FIX_K4 + CV_CALIB_FIX_K5 + CV_CALIB_FIX_K6; flags |= CV_CALIB_FIX_K4 + CV_CALIB_FIX_K5 + CV_CALIB_FIX_K6;
if( !(flags & CV_CALIB_THIN_PRISM_MODEL))
flags |= CALIB_FIX_S1_S2_S3_S4;
if( flags & CV_CALIB_FIX_K1 ) if( flags & CV_CALIB_FIX_K1 )
mask[4] = 0; mask[4] = 0;
if( flags & CV_CALIB_FIX_K2 ) if( flags & CV_CALIB_FIX_K2 )
@ -1415,8 +1417,6 @@ CV_IMPL double cvCalibrateCamera2( const CvMat* objectPoints,
mask[10] = 0; mask[10] = 0;
if( flags & CV_CALIB_FIX_K6 ) if( flags & CV_CALIB_FIX_K6 )
mask[11] = 0; mask[11] = 0;
if(!(flags & CV_CALIB_THIN_PRISM_MODEL))
flags |= CALIB_FIX_S1_S2_S3_S4;
if(flags & CALIB_FIX_S1_S2_S3_S4) if(flags & CALIB_FIX_S1_S2_S3_S4)
{ {
@ -3026,6 +3026,7 @@ static Mat prepareDistCoeffs(Mat& distCoeffs0, int rtype)
if( distCoeffs0.size() == Size(1, 4) || if( distCoeffs0.size() == Size(1, 4) ||
distCoeffs0.size() == Size(1, 5) || distCoeffs0.size() == Size(1, 5) ||
distCoeffs0.size() == Size(1, 8) || distCoeffs0.size() == Size(1, 8) ||
distCoeffs0.size() == Size(1, 12) ||
distCoeffs0.size() == Size(4, 1) || distCoeffs0.size() == Size(4, 1) ||
distCoeffs0.size() == Size(5, 1) || distCoeffs0.size() == Size(5, 1) ||
distCoeffs0.size() == Size(8, 1) || distCoeffs0.size() == Size(8, 1) ||

Write Preview
Loading…
Cancel
Save