Merge pull request #3832 from Dmitry-Me:fixNullPointerDereference3

b7089693 · Vadim Pisarevsky · 8cf45ce0 · 52a8d37f · b7089693
Commit b7089693 authored Mar 17, 2015 by Vadim Pisarevsky
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

calibration.cpp modules/calib3d/src/calibration.cpp +3 -0

No files found.
--- 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;
+        if(pasp)
            my = *pasp;
+        else
+            my = 1.0;
    }

    /* Calculate fovx and fovy. */