Merge remote-tracking branch 'upstream/master'

Conflicts: modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
2014-08-05 12:59:47 +02:00
parent 3e2a57ff35 a05ce00a65
commit a3e74ec521
1011 changed files with 94453 additions and 196987 deletions
--- a/modules/calib3d/include/opencv2/calib3d.hpp
+++ b/modules/calib3d/include/opencv2/calib3d.hpp
@@ -315,6 +315,11 @@ CV_EXPORTS_W  int estimateAffine3D(InputArray src, InputArray dst,
                                   double ransacThreshold = 3, double confidence = 0.99);


+CV_EXPORTS_W int decomposeHomographyMat(InputArray H,
+                                        InputArray K,
+                                        OutputArrayOfArrays rotations,
+                                        OutputArrayOfArrays translations,
+                                        OutputArrayOfArrays normals);

 class CV_EXPORTS_W StereoMatcher : public Algorithm
 {