Merge branch '2.4'

2012-10-23 20:32:19 +04:00
parent 1cb21d292b 15b7b01243
commit 8dbde3297e
24 changed files with 131 additions and 79 deletions
--- a/modules/calib3d/perf/perf_pnp.cpp
+++ b/modules/calib3d/perf/perf_pnp.cpp
@@ -96,7 +96,7 @@ PERF_TEST(PointsNum_Algo, solveP3P)
    SANITY_CHECK(tvec, 1e-6);
 }

-PERF_TEST_P(PointsNum, SolvePnPRansac, testing::Values(4, 3*9, 7*13))
+PERF_TEST_P(PointsNum, DISABLED_SolvePnPRansac, testing::Values(4, 3*9, 7*13))
 {
    int count = GetParam();