accept default distortion coefficients (Mat() ~ (0,0,0,0,0))

pull/13383/head
Vadim Pisarevsky 15 years ago
parent d6a3212084
commit 7a715aa792
  1. 6
      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 );
}

Loading…
Cancel
Save