Merge pull request opencv#9067 from D-Alex:master

alalek · web-flow · commit 823353d3ac12 · 2017-07-03T16:20:03.000Z
Fix error message fisheye CALIB_CHECK_COND
diff --git a/modules/calib3d/src/fisheye.cpp b/modules/calib3d/src/fisheye.cpp
@@ -1401,7 +1401,8 @@ void cv::internal::CalibrateExtrinsics(InputArrayOfArrays objectPoints, InputArr
         if (check_cond)
         {
             SVD svd(JJ_kk, SVD::NO_UV);
-            CV_Assert(svd.w.at<double>(0) / svd.w.at<double>((int)svd.w.total() - 1) < thresh_cond);
+            if(svd.w.at<double>(0) / svd.w.at<double>((int)svd.w.total() - 1) > thresh_cond )
+                CV_Error( cv::Error::StsInternal, format("CALIB_CHECK_COND - Ill-conditioned matrix for input array %d",image_idx));
         }
         omckk.reshape(3,1).copyTo(omc.getMat().col(image_idx));
         Tckk.reshape(3,1).copyTo(Tc.getMat().col(image_idx));

Original file line number	Diff line number	Diff line change
`@@ -1401,7 +1401,8 @@ void cv::internal::CalibrateExtrinsics(InputArrayOfArrays objectPoints, InputArr`
`1401`	`1401`	`if (check_cond)`
`1402`	`1402`	`{`
`1403`	`1403`	`SVD svd(JJ_kk, SVD::NO_UV);`
`1404`		`- CV_Assert(svd.w.at<double>(0) / svd.w.at<double>((int)svd.w.total() - 1) < thresh_cond);`
	`1404`	`+ if(svd.w.at<double>(0) / svd.w.at<double>((int)svd.w.total() - 1) > thresh_cond )`
	`1405`	`+ CV_Error( cv::Error::StsInternal, format("CALIB_CHECK_COND - Ill-conditioned matrix for input array %d",image_idx));`
`1405`	`1406`	`}`
`1406`	`1407`	`omckk.reshape(3,1).copyTo(omc.getMat().col(image_idx));`
`1407`	`1408`	`Tckk.reshape(3,1).copyTo(Tc.getMat().col(image_idx));`