Merge pull request #391 from taka-no-me:fix_buildbot_issues

92460ade · Andrey Kamaev · OpenCV Buildbot · acb2cb5b · e3b45910 · 92460ade
Commit 92460ade authored 12 years ago by Andrey Kamaev Committed by OpenCV Buildbot 12 years ago
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

test_rotation_and_scale_invariance.cpp modules/nonfree/test/test_rotation_and_scale_invariance.cpp +1 -1

stabilizer.cpp modules/videostab/src/stabilizer.cpp +4 -0

No files found.
--- a/modules/nonfree/test/test_rotation_and_scale_invariance.cpp
+++ b/modules/nonfree/test/test_rotation_and_scale_invariance.cpp
@@ -621,7 +621,7 @@ TEST(Features2d_RotationInvariance_Detector_SURF, regression)
    test.safe_run();
 }

-TEST(Features2d_RotationInvariance_Detector_SIFT, regression)
+TEST(Features2d_RotationInvariance_Detector_SIFT, DISABLED_regression)
 {
    DetectorRotationInvarianceTest test(Algorithm::create<FeatureDetector>("Feature2D.SIFT"),
                                        0.45f,

--- a/modules/videostab/src/stabilizer.cpp
+++ b/modules/videostab/src/stabilizer.cpp
@@ -40,6 +40,10 @@
 //
 //M*/

+#if defined __clang__
+#  pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor"
+#endif
+
 #include "precomp.hpp"
 #include "opencv2/videostab/stabilizer.hpp"