Merge branch '2.4'

2013-02-01 14:58:52 +04:00
parent d874d93e24 b179e2dd2d
commit 61079547f0
44 changed files with 475 additions and 159 deletions
--- a/modules/stitching/perf/perf_stich.cpp
+++ b/modules/stitching/perf/perf_stich.cpp
@@ -154,7 +154,7 @@ PERF_TEST_P( match, bestOf2Nearest, TEST_DETECTORS)

 PERF_TEST_P( matchVector, bestOf2NearestVectorFeatures, testing::Combine(
                 TEST_DETECTORS,
-                 testing::Values(2, 4, 6, 8))
+                 testing::Values(2, 4, 8))
             )
 {
    Mat img1, img1_full = imread( getDataPath("stitching/b1.png") );