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