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/imgproc/perf/perf_cornerHarris.cpp
+++ b/modules/imgproc/perf/perf_cornerHarris.cpp
@@ -17,7 +17,7 @@ PERF_TEST_P(Img_BlockSize_ApertureSize_k_BorderType, cornerHarris,
                testing::Values( 3, 5 ),
                testing::Values( 3, 5 ),
                testing::Values( 0.04, 0.1 ),
-                testing::ValuesIn(BorderType::all())
+                BorderType::all()
                )
          )
 {