fixed calibrateCamera API (ticket #1143

An error occurred

)

14 years ago · f4dc4b43e4
parent d5ba7c3826
commit f4dc4b43e4
3 changed files with 7 additions and 6 deletions
--- a/modules/calib3d/include/opencv2/calib3d/calib3d.hpp
+++ b/modules/calib3d/include/opencv2/calib3d/calib3d.hpp
@ -562,7 +562,7 @@ CV_EXPORTS_W double calibrateCamera( InputArrayOfArrays objectPoints,
                                     Size imageSize,
                                     CV_IN_OUT InputOutputArray cameraMatrix,
                                     CV_IN_OUT InputOutputArray distCoeffs,
-                                     OutputArray rvecs, OutputArray tvecs,
+                                     OutputArrayOfArrays rvecs, OutputArrayOfArrays tvecs,
                                     int flags=0 );

 //! computes several useful camera characteristics from the camera matrix, camera frame resolution and the physical sensor size.
--- a/modules/calib3d/src/calibration.cpp
+++ b/modules/calib3d/src/calibration.cpp
@ -3351,7 +3351,7 @@ cv::Mat cv::initCameraMatrix2D( InputArrayOfArrays objectPoints,
 double cv::calibrateCamera( InputArrayOfArrays _objectPoints,
                            InputArrayOfArrays _imagePoints,
                            Size imageSize, InputOutputArray _cameraMatrix, InputOutputArray _distCoeffs,
-                            OutputArray _rvecs, OutputArray _tvecs, int flags )
+                            OutputArrayOfArrays _rvecs, OutputArrayOfArrays _tvecs, int flags )
 {
    int rtype = CV_64F;
    Mat cameraMatrix = _cameraMatrix.getMat();
--- a/samples/python2/calibrate.py
+++ b/samples/python2/calibrate.py
@ -51,7 +51,8 @@ if __name__ == '__main__':
    camera_matrix = np.zeros((3, 3))
    dist_coefs = np.zeros(4)
    img_n = len(img_points)
-    rvecs = [np.zeros(3) for i in xrange(img_n)]
-    tvecs = [np.zeros(3) for i in xrange(img_n)]
-    rms = cv2.calibrateCamera(obj_points, img_points, (w, h), camera_matrix, dist_coefs) #, rvecs, tvecs)
-    print rms
+    rms, camera_matrix, dist_coefs, rvecs, tvecs = cv2.calibrateCamera(obj_points, img_points, (w, h), camera_matrix, dist_coefs)
+    print "RMS:", rms
+    print "camera matrix: ", camera_matrix
+    print "distortion coefficients: ", dist_coefs
+