Merge pull request #3832 from Dmitry-Me:fixNullPointerDereference3

2015-03-17 10:36:52 +00:00
parent 8cf45ce0af 52a8d37f11
commit b708969326
1 changed files with 4 additions and 1 deletions
--- a/modules/calib3d/src/calibration.cpp
+++ b/modules/calib3d/src/calibration.cpp
@@ -1595,7 +1595,10 @@ void cvCalibrationMatrixValues( const CvMat *calibMatr, CvSize imgSize,
        my = imgHeight / apertureHeight;
    } else {
        mx = 1.0;
-        my = *pasp;
+        if(pasp)
+            my = *pasp;
+        else
+            my = 1.0;
    }

    /* Calculate fovx and fovy. */