Merge pull request #12731 from UnderscoreAsterisk:fix-12012

* fix #12012 * Replace CV_StsBadFlag with Error::StsBadFlag
7 years ago · 0ffc186680
parent 50beef605b
commit 0ffc186680
1 changed files with 3 additions and 0 deletions
--- a/modules/calib3d/src/calibration.cpp
+++ b/modules/calib3d/src/calibration.cpp
@ -3540,6 +3540,9 @@ double cv::stereoCalibrate( InputArrayOfArrays _objectPoints,
                          OutputArray _Emat, OutputArray _Fmat, int flags,
                          TermCriteria criteria)
 {
+    if (flags & CALIB_USE_EXTRINSIC_GUESS)
+        CV_Error(Error::StsBadFlag, "stereoCalibrate does not support CALIB_USE_EXTRINSIC_GUESS.");
+
    Mat Rmat, Tmat;
    double ret = stereoCalibrate(_objectPoints, _imagePoints1, _imagePoints2, _cameraMatrix1, _distCoeffs1,
                                 _cameraMatrix2, _distCoeffs2, imageSize, Rmat, Tmat, _Emat, _Fmat,