calib3d: fix warning from gcc7

sovrasov · sovrasov · commit e0ff5106d346 · 2017-08-25T16:29:59.000+03:00
diff --git a/modules/calib3d/src/solvepnp.cpp b/modules/calib3d/src/solvepnp.cpp
@@ -137,7 +137,7 @@ bool solvePnP( InputArray _opoints, InputArray _ipoints,
         CvMat c_cameraMatrix = cameraMatrix, c_distCoeffs = distCoeffs;
         CvMat c_rvec = rvec, c_tvec = tvec;
         cvFindExtrinsicCameraParams2(&c_objectPoints, &c_imagePoints, &c_cameraMatrix,
-                                     c_distCoeffs.rows*c_distCoeffs.cols ? &c_distCoeffs : 0,
+                                     (c_distCoeffs.rows && c_distCoeffs.cols) ? &c_distCoeffs : 0,
                                      &c_rvec, &c_tvec, useExtrinsicGuess );
         result = true;
     }

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ bool solvePnP( InputArray _opoints, InputArray _ipoints,`
`137`	`137`	`CvMat c_cameraMatrix = cameraMatrix, c_distCoeffs = distCoeffs;`
`138`	`138`	`CvMat c_rvec = rvec, c_tvec = tvec;`
`139`	`139`	`cvFindExtrinsicCameraParams2(&c_objectPoints, &c_imagePoints, &c_cameraMatrix,`
`140`		`- c_distCoeffs.rows*c_distCoeffs.cols ? &c_distCoeffs : 0,`
	`140`	`+ (c_distCoeffs.rows && c_distCoeffs.cols) ? &c_distCoeffs : 0,`
`141`	`141`	`&c_rvec, &c_tvec, useExtrinsicGuess );`
`142`	`142`	`result = true;`
`143`	`143`	`}`