mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-24 19:20:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed bug #1700

Browse Source
This commit is contained in:
Marina Kolpakova 2012-03-19 15:59:30 +00:00
parent 14a1549dac
commit 4eaced12fe
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/calib3d/src/calibration.cpp
View File

@ -3344,10 +3344,12 @@ void cv::projectPoints( InputArray _opoints,
CvMat c_imagePoints = _ipoints.getMat(); CvMat c_imagePoints = _ipoints.getMat();
CvMat c_objectPoints = opoints; CvMat c_objectPoints = opoints;
Mat cameraMatrix = _cameraMatrix.getMat(); Mat cameraMatrix = _cameraMatrix.getMat();
Mat distCoeffs = _distCoeffs.getMat();
Mat rvec = _rvec.getMat(), tvec = _tvec.getMat(); Mat rvec = _rvec.getMat(), tvec = _tvec.getMat();
CvMat c_cameraMatrix = cameraMatrix; CvMat c_cameraMatrix = cameraMatrix;
CvMat c_rvec = rvec, c_tvec = tvec; CvMat c_rvec = rvec, c_tvec = tvec;
Mat distCoeffs = _distCoeffs.getMat();
CvMat c_distCoeffs = distCoeffs; CvMat c_distCoeffs = distCoeffs;
int ndistCoeffs = distCoeffs.rows + distCoeffs.cols - 1; int ndistCoeffs = distCoeffs.rows + distCoeffs.cols - 1;
@ -3362,7 +3364,8 @@ void cv::projectPoints( InputArray _opoints,
pdpddist = &(dpddist = jacobian.colRange(10, 10+ndistCoeffs)); pdpddist = &(dpddist = jacobian.colRange(10, 10+ndistCoeffs));
} }
cvProjectPoints2( &c_objectPoints, &c_rvec, &c_tvec, &c_cameraMatrix, &c_distCoeffs, cvProjectPoints2( &c_objectPoints, &c_rvec, &c_tvec, &c_cameraMatrix,
(distCoeffs.empty())? 0: &c_distCoeffs,
&c_imagePoints, pdpdrot, pdpdt, pdpdf, pdpdc, pdpddist, aspectRatio ); &c_imagePoints, pdpdrot, pdpdt, pdpdf, pdpdc, pdpddist, aspectRatio );
} }