From 7a715aa792a4ec4fa9ccd6c1aa7e22e25ccecbfe Mon Sep 17 00:00:00 2001
From: Vadim Pisarevsky <no@email>
Date: Thu, 10 Jun 2010 23:37:46 +0000
Subject: [PATCH] accept default distortion coefficients (Mat() ~ (0,0,0,0,0))

---
 modules/calib3d/src/calibration.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/calib3d/src/calibration.cpp b/modules/calib3d/src/calibration.cpp
index 9b9362b5d7..0227fd34b3 100644
--- a/modules/calib3d/src/calibration.cpp
+++ b/modules/calib3d/src/calibration.cpp
@@ -3170,7 +3170,8 @@ void cv::projectPoints( const Mat& opoints,
     CvMat _objectPoints = opoints, _imagePoints = Mat(ipoints);
     CvMat _rvec = rvec, _tvec = tvec, _cameraMatrix = cameraMatrix, _distCoeffs = distCoeffs;
     
-    cvProjectPoints2( &_objectPoints, &_rvec, &_tvec, &_cameraMatrix, &_distCoeffs,
+    cvProjectPoints2( &_objectPoints, &_rvec, &_tvec, &_cameraMatrix,
+                     distCoeffs.data ? &_distCoeffs : 0,
                      &_imagePoints, 0, 0, 0, 0, 0, 0 );
 }
 
@@ -3219,7 +3220,8 @@ void cv::solvePnP( const Mat& opoints, const Mat& ipoints,
     CvMat _cameraMatrix = cameraMatrix, _distCoeffs = distCoeffs;
     CvMat _rvec = rvec, _tvec = tvec;
     cvFindExtrinsicCameraParams2(&_objectPoints, &_imagePoints, &_cameraMatrix,
-                                 &_distCoeffs, &_rvec, &_tvec, useExtrinsicGuess );
+                                 distCoeffs.data ? &_distCoeffs : 0,
+                                 &_rvec, &_tvec, useExtrinsicGuess );
 }