Merge pull request #20879 from Wehzie:patch-1

This commit is contained in:
Alexander Alekhin 2021-10-17 16:50:13 +00:00
commit e6c68eed51

View File

@ -1737,7 +1737,7 @@ void cvCalibrationMatrixValues( const CvMat *calibMatr, CvSize imgSize,
CV_Error(CV_StsNullPtr, "Some of parameters is a NULL pointer!"); CV_Error(CV_StsNullPtr, "Some of parameters is a NULL pointer!");
if(!CV_IS_MAT(calibMatr)) if(!CV_IS_MAT(calibMatr))
CV_Error(CV_StsUnsupportedFormat, "Input parameters must be a matrices!"); CV_Error(CV_StsUnsupportedFormat, "Input parameters must be matrices!");
double dummy = .0; double dummy = .0;
Point2d pp; Point2d pp;
@ -3078,7 +3078,7 @@ cvDecomposeProjectionMatrix( const CvMat *projMatr, CvMat *calibMatr,
CV_Error(CV_StsNullPtr, "Some of parameters is a NULL pointer!"); CV_Error(CV_StsNullPtr, "Some of parameters is a NULL pointer!");
if(!CV_IS_MAT(projMatr) || !CV_IS_MAT(calibMatr) || !CV_IS_MAT(rotMatr) || !CV_IS_MAT(posVect)) if(!CV_IS_MAT(projMatr) || !CV_IS_MAT(calibMatr) || !CV_IS_MAT(rotMatr) || !CV_IS_MAT(posVect))
CV_Error(CV_StsUnsupportedFormat, "Input parameters must be a matrices!"); CV_Error(CV_StsUnsupportedFormat, "Input parameters must be matrices!");
if(projMatr->cols != 4 || projMatr->rows != 3) if(projMatr->cols != 4 || projMatr->rows != 3)
CV_Error(CV_StsUnmatchedSizes, "Size of projection matrix must be 3x4!"); CV_Error(CV_StsUnmatchedSizes, "Size of projection matrix must be 3x4!");