Merge pull request opencv#9153 from sovrasov:fix_tangent_dist_flag

alalek · alalek · commit 7d17d20dce4d · 2017-07-14T14:35:51.000Z
diff --git a/modules/calib3d/src/calibration.cpp b/modules/calib3d/src/calibration.cpp
@@ -1518,7 +1518,7 @@ static double cvCalibrateCamera2Internal( const CvMat* objectPoints,
     mask[ 5] = !(flags & CALIB_FIX_K2);
     if( flags & CALIB_FIX_TANGENT_DIST )
     {
-      mask[6]  = mask[7]  = 1;
+      mask[6]  = mask[7]  = 0;
     }
     mask[ 8] = !(flags & CALIB_FIX_K3);
     mask[ 9] = !(flags & CALIB_FIX_K4);

Original file line number	Diff line number	Diff line change
`@@ -1518,7 +1518,7 @@ static double cvCalibrateCamera2Internal( const CvMat* objectPoints,`
`1518`	`1518`	`mask[ 5] = !(flags & CALIB_FIX_K2);`
`1519`	`1519`	`if( flags & CALIB_FIX_TANGENT_DIST )`
`1520`	`1520`	`{`
`1521`		`- mask[6] = mask[7] = 1;`
	`1521`	`+ mask[6] = mask[7] = 0;`
`1522`	`1522`	`}`
`1523`	`1523`	`mask[ 8] = !(flags & CALIB_FIX_K3);`
`1524`	`1524`	`mask[ 9] = !(flags & CALIB_FIX_K4);`