Merge branch '2.4'

2013-04-17 12:07:17 +04:00
parent 974f1f4895 f6848b66d6
commit 8fdab9f631
38 changed files with 1462 additions and 1178 deletions
--- a/modules/features2d/perf/perf_fast.cpp
+++ b/modules/features2d/perf/perf_fast.cpp
@@ -18,7 +18,7 @@ typedef perf::TestBaseWithParam<File_Type_t> fast;

 PERF_TEST_P(fast, detect, testing::Combine(
                            testing::Values(FAST_IMAGES),
-                            testing::ValuesIn(FastType::all())
+                            FastType::all()
                          ))
 {
    string filename = getDataPath(get<0>(GetParam()));