Merge branch 2.4

2012-12-14 14:46:41 +04:00
parent 464826c232 9b09f09b9a
commit f5cd20d80b
13 changed files with 187 additions and 110 deletions
--- a/modules/calib3d/perf/perf_pnp.cpp
+++ b/modules/calib3d/perf/perf_pnp.cpp
@@ -16,7 +16,7 @@ typedef perf::TestBaseWithParam<int> PointsNum;

 PERF_TEST_P(PointsNum_Algo, solvePnP,
            testing::Combine(
-                testing::Values(4, 3*9, 7*13),
+                testing::Values(/*4,*/ 3*9, 7*13), //TODO: find why results on 4 points are too unstable
                testing::Values((int)CV_ITERATIVE, (int)CV_EPNP)
                )
            )