generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge release 2.4.3

Browse Source
This commit is contained in:
Andrey Kamaev
2012-11-02 17:45:58 +04:00
parent 66b90d19a6 6484732509
commit 4d059e9e5b
126 changed files with 61518 additions and 51142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/calib3d/perf/perf_pnp.cpp
View File

@@ -55,7 +55,7 @@ PERF_TEST_P(PointsNum_Algo, solvePnP,
}
SANITY_CHECK(rvec, 1e-6);
SANITY_CHECK(tvec, 1e-6);
SANITY_CHECK(tvec, 1e-3);
}
PERF_TEST(PointsNum_Algo, solveP3P)

5
modules/calib3d/perf/perf_precomp.hpp
View File

@@ -1,6 +1,9 @@
#ifdef __GNUC__
# pragma GCC diagnostic ignored "-Wmissing-declarations"
# pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX
# ifdef __clang__
# pragma GCC diagnostic ignored "-Wmissing-prototypes"
# pragma GCC diagnostic ignored "-Wextra"
# endif
#endif
#ifndef __OPENCV_PERF_PRECOMP_HPP__

2
modules/calib3d/test/test_cameracalibration_artificial.cpp
View File

@@ -426,4 +426,4 @@ protected:
}
};
TEST(Calib3d_CalibrateCamera_CPP, accuracy_on_artificial_data) { CV_CalibrateCameraArtificialTest test; test.safe_run(); }
TEST(Calib3d_CalibrateCamera_CPP, DISABLED_accuracy_on_artificial_data) { CV_CalibrateCameraArtificialTest test; test.safe_run(); }

5
modules/calib3d/test/test_precomp.hpp
View File

@@ -1,6 +1,9 @@
#ifdef __GNUC__
# pragma GCC diagnostic ignored "-Wmissing-declarations"
# pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX
# ifdef __clang__
# pragma GCC diagnostic ignored "-Wmissing-prototypes"
# pragma GCC diagnostic ignored "-Wextra"
# endif
#endif
#ifndef __OPENCV_TEST_PRECOMP_HPP__