fixed calibrateCamera API (ticket #1143)

diff --git a/modules/calib3d/include/opencv2/calib3d/calib3d.hpp b/modules/calib3d/include/opencv2/calib3d/calib3d.hpp
index 9e800ab..83361bd 100644 (file)
--- 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.

diff --git a/modules/calib3d/src/calibration.cpp b/modules/calib3d/src/calibration.cpp
index 5c18977..a35aa7d 100644 (file)
--- 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();

diff --git a/samples/python2/calibrate.py b/samples/python2/calibrate.py
index 485ec3a..584ed39 100644 (file)
--- a/samples/python2/calibrate.py
+++ b/samples/python2/calibrate.py
@@ -51,7 +51,8 @@ if __name__ == '__main__':
     camera_matrix = np.zeros((3, 3))\r
     dist_coefs = np.zeros(4)\r
     img_n = len(img_points)\r
-    rvecs = [np.zeros(3) for i in xrange(img_n)]\r
-    tvecs = [np.zeros(3) for i in xrange(img_n)]\r
-    rms = cv2.calibrateCamera(obj_points, img_points, (w, h), camera_matrix, dist_coefs) #, rvecs, tvecs)\r
-    print rms\r
+    rms, camera_matrix, dist_coefs, rvecs, tvecs = cv2.calibrateCamera(obj_points, img_points, (w, h), camera_matrix, dist_coefs)\r
+    print "RMS:", rms\r
+    print "camera matrix: ", camera_matrix\r
+    print "distortion coefficients: ", dist_coefs\r
+\r