generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed calibrateCamera API (ticket #1143)

Browse Source
This commit is contained in:
Vadim Pisarevsky 2011-06-17 21:21:01 +00:00
parent d5ba7c3826
commit f4dc4b43e4
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/calib3d/include/opencv2/calib3d/calib3d.hpp
View File

@ -562,7 +562,7 @@ CV_EXPORTS_W double calibrateCamera( InputArrayOfArrays objectPoints,
Size imageSize, Size imageSize,
CV_IN_OUT InputOutputArray cameraMatrix, CV_IN_OUT InputOutputArray cameraMatrix,
CV_IN_OUT InputOutputArray distCoeffs, CV_IN_OUT InputOutputArray distCoeffs,
OutputArray rvecs, OutputArray tvecs, OutputArrayOfArrays rvecs, OutputArrayOfArrays tvecs,
int flags=0 ); int flags=0 );
//! computes several useful camera characteristics from the camera matrix, camera frame resolution and the physical sensor size. //! computes several useful camera characteristics from the camera matrix, camera frame resolution and the physical sensor size.

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

@ -3351,7 +3351,7 @@ cv::Mat cv::initCameraMatrix2D( InputArrayOfArrays objectPoints,
double cv::calibrateCamera( InputArrayOfArrays _objectPoints, double cv::calibrateCamera( InputArrayOfArrays _objectPoints,
InputArrayOfArrays _imagePoints, InputArrayOfArrays _imagePoints,
Size imageSize, InputOutputArray _cameraMatrix, InputOutputArray _distCoeffs, Size imageSize, InputOutputArray _cameraMatrix, InputOutputArray _distCoeffs,
OutputArray _rvecs, OutputArray _tvecs, int flags ) OutputArrayOfArrays _rvecs, OutputArrayOfArrays _tvecs, int flags )
{ {
int rtype = CV_64F; int rtype = CV_64F;
Mat cameraMatrix = _cameraMatrix.getMat(); Mat cameraMatrix = _cameraMatrix.getMat();

9
samples/python2/calibrate.py
View File

@ -51,7 +51,8 @@ if __name__ == '__main__':
camera_matrix = np.zeros((3, 3)) camera_matrix = np.zeros((3, 3))
dist_coefs = np.zeros(4) dist_coefs = np.zeros(4)
img_n = len(img_points) img_n = len(img_points)
rvecs = [np.zeros(3) for i in xrange(img_n)] rms, camera_matrix, dist_coefs, rvecs, tvecs = cv2.calibrateCamera(obj_points, img_points, (w, h), camera_matrix, dist_coefs)
tvecs = [np.zeros(3) for i in xrange(img_n)] print "RMS:", rms
rms = cv2.calibrateCamera(obj_points, img_points, (w, h), camera_matrix, dist_coefs) #, rvecs, tvecs) print "camera matrix: ", camera_matrix
print rms print "distortion coefficients: ", dist_coefs