quiet most of the OSX build warnings

2012-07-05 12:56:31 +00:00 · 2012-07-05 12:56:31 +00:00 · e900952b87
commit e900952b87
parent b712bbe9a5
30 changed files with 39 additions and 10 deletions
--- a/modules/calib3d/perf/perf_precomp.hpp
+++ b/modules/calib3d/perf/perf_precomp.hpp
@ -1,5 +1,6 @@
 #ifdef __GNUC__
 #  pragma GCC diagnostic ignored "-Wmissing-declarations"
+#  pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX
 #endif

 #ifndef __OPENCV_PERF_PRECOMP_HPP__
--- a/modules/calib3d/test/test_precomp.hpp
+++ b/modules/calib3d/test/test_precomp.hpp
@ -1,5 +1,6 @@
 #ifdef __GNUC__
 #  pragma GCC diagnostic ignored "-Wmissing-declarations"
+#  pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX
 #endif

 #ifndef __OPENCV_TEST_PRECOMP_HPP__
--- a/modules/contrib/src/rgbdodometry.cpp
+++ b/modules/contrib/src/rgbdodometry.cpp
@ -40,6 +40,8 @@
 //
 //M*/

+#include "precomp.hpp"
+
 #define SHOW_DEBUG_IMAGES 0

 #include "opencv2/core/core.hpp"
@ -49,12 +51,11 @@
 #  include "opencv2/highgui/highgui.hpp"
 #endif

-#include "precomp.hpp"
-
 #include <iostream>
+#include <limits>

+#include "opencv2/core/internal.hpp"
 #if defined(HAVE_EIGEN) && EIGEN_WORLD_VERSION == 3
-#  include <Eigen/Core>
 #  ifdef ANDROID
     template <typename Scalar> Scalar log2(Scalar v) { using std::log; return log(v)/log(Scalar(2)); }
 #  endif
@ -62,8 +63,6 @@
 #  include <Eigen/Dense>
 #endif

-#include <limits>
-
 using namespace cv;

 inline static
--- a/modules/contrib/test/test_precomp.hpp
+++ b/modules/contrib/test/test_precomp.hpp
@ -1,5 +1,6 @@
 #ifdef __GNUC__
 #  pragma GCC diagnostic ignored "-Wmissing-declarations"
+#  pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX
 #endif

 #ifndef __OPENCV_TEST_PRECOMP_HPP__
--- a/modules/core/include/opencv2/core/eigen.hpp
+++ b/modules/core/include/opencv2/core/eigen.hpp
@ -73,7 +73,7 @@ void eigen2cv( const Eigen::Matrix<_Tp, _rows, _cols, _options, _maxRows, _maxCo
        _src.copyTo(dst);
    }
 }
-    
+
 template<typename _Tp, int _rows, int _cols, int _options, int _maxRows, int _maxCols>
 void cv2eigen( const Mat& src,
               Eigen::Matrix<_Tp, _rows, _cols, _options, _maxRows, _maxCols>& dst )
@ -132,14 +132,14 @@ void cv2eigen( const Mat& src,
    }
 }

-    
+
 template<typename _Tp>
 void cv2eigen( const Mat& src,
               Eigen::Matrix<_Tp, Eigen::Dynamic, 1>& dst )
 {
    CV_Assert(src.cols == 1);
    dst.resize(src.rows);
-    
+
    if( !(dst.Flags & Eigen::RowMajorBit) )
    {
        Mat _dst(src.cols, src.rows, DataType<_Tp>::type,
@ -183,8 +183,8 @@ void cv2eigen( const Mat& src,
        src.convertTo(_dst, _dst.type());
        CV_DbgAssert(_dst.data == (uchar*)dst.data());
    }
-}                     
-              
+}
+
 }

 #endif
--- a/modules/core/include/opencv2/core/internal.hpp
+++ b/modules/core/include/opencv2/core/internal.hpp
@ -156,6 +156,9 @@ CV_INLINE IppiSize ippiSize(int width, int height)
 #endif

 #ifdef HAVE_EIGEN
+#  if defined __GNUC__ && defined __APPLE__
+#    pragma GCC diagnostic ignored "-Wshadow"
+#  endif
 #  include <Eigen/Core>
 #  include "opencv2/core/eigen.hpp"
 #endif
--- a/modules/core/perf/perf_precomp.hpp
+++ b/modules/core/perf/perf_precomp.hpp
@ -1,5 +1,6 @@
 #ifdef __GNUC__
 #  pragma GCC diagnostic ignored "-Wmissing-declarations"
+#  pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX
 #endif

 #ifndef __OPENCV_PERF_PRECOMP_HPP__
--- a/modules/core/test/test_precomp.hpp
+++ b/modules/core/test/test_precomp.hpp
@ -1,5 +1,6 @@
 #ifdef __GNUC__
 #  pragma GCC diagnostic ignored "-Wmissing-declarations"
+#  pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX
 #endif

 #ifndef __OPENCV_TEST_PRECOMP_HPP__
--- a/modules/features2d/perf/perf_precomp.hpp
+++ b/modules/features2d/perf/perf_precomp.hpp
@ -1,5 +1,6 @@
 #ifdef __GNUC__
 #  pragma GCC diagnostic ignored "-Wmissing-declarations"
+#  pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX
 #endif

 #ifndef __OPENCV_PERF_PRECOMP_HPP__
--- a/modules/features2d/src/matchers.cpp
+++ b/modules/features2d/src/matchers.cpp
@ -41,6 +41,7 @@

 #include "precomp.hpp"

+#include "opencv2/core/internal.hpp"
 #if defined(HAVE_EIGEN) && EIGEN_WORLD_VERSION == 2
 #include <Eigen/Array>
 #endif
--- a/modules/features2d/test/test_precomp.hpp
+++ b/modules/features2d/test/test_precomp.hpp
@ -1,5 +1,6 @@
 #ifdef __GNUC__
 #  pragma GCC diagnostic ignored "-Wmissing-declarations"
+#  pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX
 #endif

 #ifndef __OPENCV_TEST_PRECOMP_HPP__
--- a/modules/gpu/perf/perf_precomp.hpp
+++ b/modules/gpu/perf/perf_precomp.hpp
@ -1,5 +1,6 @@
 #ifdef __GNUC__
 #  pragma GCC diagnostic ignored "-Wmissing-declarations"
+#  pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX
 #endif

 #ifndef __OPENCV_PERF_PRECOMP_HPP__
--- a/modules/gpu/perf_cpu/perf_cpu_precomp.hpp
+++ b/modules/gpu/perf_cpu/perf_cpu_precomp.hpp
@ -1,5 +1,6 @@
 #ifdef __GNUC__
 #  pragma GCC diagnostic ignored "-Wmissing-declarations"
+#  pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX
 #endif

 #ifndef __OPENCV_PERF_CPU_PRECOMP_HPP__
--- a/modules/gpu/test/precomp.hpp
+++ b/modules/gpu/test/precomp.hpp
@ -41,6 +41,7 @@

 #ifdef __GNUC__
 #  pragma GCC diagnostic ignored "-Wmissing-declarations"
+#  pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX
 #endif

 #ifndef __OPENCV_TEST_PRECOMP_HPP__
--- a/modules/highgui/perf/perf_precomp.hpp
+++ b/modules/highgui/perf/perf_precomp.hpp
@ -1,5 +1,6 @@
 #ifdef __GNUC__
 #  pragma GCC diagnostic ignored "-Wmissing-declarations"
+#  pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX
 #endif

 #ifndef __OPENCV_PERF_PRECOMP_HPP__
--- a/modules/highgui/test/test_precomp.hpp
+++ b/modules/highgui/test/test_precomp.hpp
@ -1,5 +1,6 @@
 #ifdef __GNUC__
 #  pragma GCC diagnostic ignored "-Wmissing-declarations"
+#  pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX
 #endif

 #ifndef __OPENCV_TEST_PRECOMP_HPP__
--- a/modules/imgproc/perf/perf_precomp.hpp
+++ b/modules/imgproc/perf/perf_precomp.hpp
@ -1,5 +1,6 @@
 #ifdef __GNUC__
 #  pragma GCC diagnostic ignored "-Wmissing-declarations"
+#  pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX
 #endif

 #ifndef __OPENCV_PERF_PRECOMP_HPP__
--- a/modules/imgproc/test/test_precomp.hpp
+++ b/modules/imgproc/test/test_precomp.hpp
@ -1,5 +1,6 @@
 #ifdef __GNUC__
 #  pragma GCC diagnostic ignored "-Wmissing-declarations"
+#  pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX
 #endif

 #ifndef __OPENCV_TEST_PRECOMP_HPP__
--- a/modules/legacy/test/test_precomp.hpp
+++ b/modules/legacy/test/test_precomp.hpp
@ -1,5 +1,6 @@
 #ifdef __GNUC__
 #  pragma GCC diagnostic ignored "-Wmissing-declarations"
+#  pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX
 #endif

 #ifndef __OPENCV_TEST_PRECOMP_HPP__
--- a/modules/ml/test/test_precomp.hpp
+++ b/modules/ml/test/test_precomp.hpp
@ -1,5 +1,6 @@
 #ifdef __GNUC__
 #  pragma GCC diagnostic ignored "-Wmissing-declarations"
+#  pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX
 #endif

 #ifndef __OPENCV_TEST_PRECOMP_HPP__
--- a/modules/nonfree/perf/perf_precomp.hpp
+++ b/modules/nonfree/perf/perf_precomp.hpp
@ -1,5 +1,6 @@
 #ifdef __GNUC__
 #  pragma GCC diagnostic ignored "-Wmissing-declarations"
+#  pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX
 #endif

 #ifndef __OPENCV_PERF_PRECOMP_HPP__
--- a/modules/nonfree/test/test_precomp.hpp
+++ b/modules/nonfree/test/test_precomp.hpp
@ -1,5 +1,6 @@
 #ifdef __GNUC__
 #  pragma GCC diagnostic ignored "-Wmissing-declarations"
+#  pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX
 #endif

 #ifndef __OPENCV_TEST_PRECOMP_HPP__
--- a/modules/objdetect/perf/perf_precomp.hpp
+++ b/modules/objdetect/perf/perf_precomp.hpp
@ -1,5 +1,6 @@
 #ifdef __GNUC__
 #  pragma GCC diagnostic ignored "-Wmissing-declarations"
+#  pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX
 #endif

 #ifndef __OPENCV_PERF_PRECOMP_HPP__
--- a/modules/objdetect/test/test_precomp.hpp
+++ b/modules/objdetect/test/test_precomp.hpp
@ -1,5 +1,6 @@
 #ifdef __GNUC__
 #  pragma GCC diagnostic ignored "-Wmissing-declarations"
+#  pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX
 #endif

 #ifndef __OPENCV_TEST_PRECOMP_HPP__
--- a/modules/photo/perf/perf_precomp.hpp
+++ b/modules/photo/perf/perf_precomp.hpp
@ -1,5 +1,6 @@
 #ifdef __GNUC__
 #  pragma GCC diagnostic ignored "-Wmissing-declarations"
+#  pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX
 #endif

 #ifndef __OPENCV_PERF_PRECOMP_HPP__
--- a/modules/photo/test/test_precomp.hpp
+++ b/modules/photo/test/test_precomp.hpp
@ -1,5 +1,6 @@
 #ifdef __GNUC__
 #  pragma GCC diagnostic ignored "-Wmissing-declarations"
+#  pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX
 #endif

 #ifndef __OPENCV_TEST_PRECOMP_HPP__
--- a/modules/stitching/perf/perf_precomp.hpp
+++ b/modules/stitching/perf/perf_precomp.hpp
@ -1,5 +1,6 @@
 #ifdef __GNUC__
 #  pragma GCC diagnostic ignored "-Wmissing-declarations"
+#  pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX
 #endif

 #ifndef __OPENCV_PERF_PRECOMP_HPP__
--- a/modules/stitching/test/test_precomp.hpp
+++ b/modules/stitching/test/test_precomp.hpp
@ -1,5 +1,6 @@
 #ifdef __GNUC__
 #  pragma GCC diagnostic ignored "-Wmissing-declarations"
+#  pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX
 #endif

 #ifndef __OPENCV_TEST_PRECOMP_HPP__
--- a/modules/video/perf/perf_precomp.hpp
+++ b/modules/video/perf/perf_precomp.hpp
@ -1,5 +1,6 @@
 #ifdef __GNUC__
 #  pragma GCC diagnostic ignored "-Wmissing-declarations"
+#  pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX
 #endif

 #ifndef __OPENCV_VIDEO_PRECOMP_HPP__
--- a/modules/video/test/test_precomp.hpp
+++ b/modules/video/test/test_precomp.hpp
@ -1,5 +1,6 @@
 #ifdef __GNUC__
 #  pragma GCC diagnostic ignored "-Wmissing-declarations"
+#  pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX
 #endif

 #ifndef __OPENCV_TEST_PRECOMP_HPP__