diff --git a/modules/calib3d/perf/perf_precomp.hpp b/modules/calib3d/perf/perf_precomp.hpp index ce7954272..b13bd664c 100644 --- 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__ diff --git a/modules/calib3d/test/test_precomp.hpp b/modules/calib3d/test/test_precomp.hpp index 62d876ffc..a95fc1cdc 100644 --- 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__ diff --git a/modules/contrib/src/rgbdodometry.cpp b/modules/contrib/src/rgbdodometry.cpp index 0ea8d18b4..78a507224 100644 --- 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 +#include +#include "opencv2/core/internal.hpp" #if defined(HAVE_EIGEN) && EIGEN_WORLD_VERSION == 3 -# include # ifdef ANDROID template Scalar log2(Scalar v) { using std::log; return log(v)/log(Scalar(2)); } # endif @@ -62,8 +63,6 @@ # include #endif -#include - using namespace cv; inline static diff --git a/modules/contrib/test/test_precomp.hpp b/modules/contrib/test/test_precomp.hpp index f9cbc917c..03e1cfe29 100644 --- 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__ diff --git a/modules/core/include/opencv2/core/eigen.hpp b/modules/core/include/opencv2/core/eigen.hpp index ea47e8b23..3051486ea 100644 --- 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 void cv2eigen( const Mat& src, Eigen::Matrix<_Tp, _rows, _cols, _options, _maxRows, _maxCols>& dst ) @@ -132,14 +132,14 @@ void cv2eigen( const Mat& src, } } - + template 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 diff --git a/modules/core/include/opencv2/core/internal.hpp b/modules/core/include/opencv2/core/internal.hpp index 39f8292dc..8a66e1135 100644 --- 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 # include "opencv2/core/eigen.hpp" #endif diff --git a/modules/core/perf/perf_precomp.hpp b/modules/core/perf/perf_precomp.hpp index 22a4abdd9..184e84bc4 100644 --- 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__ diff --git a/modules/core/test/test_precomp.hpp b/modules/core/test/test_precomp.hpp index f00212ff4..1326195a5 100644 --- 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__ diff --git a/modules/features2d/perf/perf_precomp.hpp b/modules/features2d/perf/perf_precomp.hpp index b8608bf9a..286852b54 100644 --- 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__ diff --git a/modules/features2d/src/matchers.cpp b/modules/features2d/src/matchers.cpp index f1a97dc77..d2f71d003 100755 --- 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 #endif diff --git a/modules/features2d/test/test_precomp.hpp b/modules/features2d/test/test_precomp.hpp index 29be5d4e2..e2daba111 100644 --- 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__ diff --git a/modules/gpu/perf/perf_precomp.hpp b/modules/gpu/perf/perf_precomp.hpp index b90777729..19608bde1 100644 --- 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__ diff --git a/modules/gpu/perf_cpu/perf_cpu_precomp.hpp b/modules/gpu/perf_cpu/perf_cpu_precomp.hpp index b755abbf1..12680c7a0 100644 --- 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__ diff --git a/modules/gpu/test/precomp.hpp b/modules/gpu/test/precomp.hpp index 5ee13e6bd..cc708b55a 100644 --- 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__ diff --git a/modules/highgui/perf/perf_precomp.hpp b/modules/highgui/perf/perf_precomp.hpp index f77c1c4ac..f7fb98da1 100644 --- 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__ diff --git a/modules/highgui/test/test_precomp.hpp b/modules/highgui/test/test_precomp.hpp index 91aff1fbd..676b80be8 100644 --- 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__ diff --git a/modules/imgproc/perf/perf_precomp.hpp b/modules/imgproc/perf/perf_precomp.hpp index d85331ee6..57e630051 100644 --- 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__ diff --git a/modules/imgproc/test/test_precomp.hpp b/modules/imgproc/test/test_precomp.hpp index f58def668..f83a86455 100644 --- 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__ diff --git a/modules/legacy/test/test_precomp.hpp b/modules/legacy/test/test_precomp.hpp index 54bfe2b71..dd9dd0e7e 100644 --- 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__ diff --git a/modules/ml/test/test_precomp.hpp b/modules/ml/test/test_precomp.hpp index 7f820b47d..8cda65f83 100644 --- 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__ diff --git a/modules/nonfree/perf/perf_precomp.hpp b/modules/nonfree/perf/perf_precomp.hpp index 66eea2599..62b601e95 100644 --- 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__ diff --git a/modules/nonfree/test/test_precomp.hpp b/modules/nonfree/test/test_precomp.hpp index ac4ce4b0e..39ac7ecde 100644 --- 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__ diff --git a/modules/objdetect/perf/perf_precomp.hpp b/modules/objdetect/perf/perf_precomp.hpp index 2682e1c20..234cb83a3 100644 --- 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__ diff --git a/modules/objdetect/test/test_precomp.hpp b/modules/objdetect/test/test_precomp.hpp index c7bd0e340..041fa24c5 100644 --- 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__ diff --git a/modules/photo/perf/perf_precomp.hpp b/modules/photo/perf/perf_precomp.hpp index 44ccb0986..49ab24809 100644 --- 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__ diff --git a/modules/photo/test/test_precomp.hpp b/modules/photo/test/test_precomp.hpp index 6f96e4ac3..4496ac889 100644 --- 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__ diff --git a/modules/stitching/perf/perf_precomp.hpp b/modules/stitching/perf/perf_precomp.hpp index c8d326ef4..dddeb07ca 100644 --- 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__ diff --git a/modules/stitching/test/test_precomp.hpp b/modules/stitching/test/test_precomp.hpp index 4d3bd230f..7ad654c3a 100644 --- 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__ diff --git a/modules/video/perf/perf_precomp.hpp b/modules/video/perf/perf_precomp.hpp index 408279141..18f414469 100644 --- 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__ diff --git a/modules/video/test/test_precomp.hpp b/modules/video/test/test_precomp.hpp index e39c6f811..bef6bf665 100644 --- 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__