merged all the latest changes from 2.4 to trunk

2012-04-13 21:50:59 +00:00
parent 020f9a6047
commit 2fd1e2ea57
416 changed files with 12852 additions and 6070 deletions
--- a/modules/stitching/doc/matching.rst
+++ b/modules/stitching/doc/matching.rst
@@ -179,6 +179,8 @@ Performs images matching.

    :param mask: Mask indicating which image pairs must be matched

+The function is parallelized with the TBB library.
+
 .. seealso:: :ocv:struct:`detail::MatchesInfo`

 detail::FeaturesMatcher::isThreadSafe
--- a/modules/stitching/doc/motion_estimation.rst
+++ b/modules/stitching/doc/motion_estimation.rst
@@ -233,7 +233,7 @@ Wave correction kind. ::

 detail::waveCorrect
 -------------------
-Tries to make panorama more horizontal (or verical).
+Tries to make panorama more horizontal (or vertical).

 .. ocv:function:: void waveCorrect(std::vector<Mat> &rmats, WaveCorrectKind kind)

--- a/modules/stitching/include/opencv2/stitching/detail/seam_finders.hpp
+++ b/modules/stitching/include/opencv2/stitching/detail/seam_finders.hpp
@@ -113,7 +113,7 @@ public:
 private:
    // To avoid GCGraph dependency
    class Impl;
-    Ptr<Impl> impl_;
+    Ptr<PairwiseSeamFinder> impl_;
 };