mirror of
https://github.com/opencv/opencv.git
synced 2025-06-07 17:44:04 +08:00
quiet most of the OSX build warnings
This commit is contained in:
parent
b712bbe9a5
commit
e900952b87
@ -1,5 +1,6 @@
|
|||||||
#ifdef __GNUC__
|
#ifdef __GNUC__
|
||||||
# pragma GCC diagnostic ignored "-Wmissing-declarations"
|
# pragma GCC diagnostic ignored "-Wmissing-declarations"
|
||||||
|
# pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef __OPENCV_PERF_PRECOMP_HPP__
|
#ifndef __OPENCV_PERF_PRECOMP_HPP__
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
#ifdef __GNUC__
|
#ifdef __GNUC__
|
||||||
# pragma GCC diagnostic ignored "-Wmissing-declarations"
|
# pragma GCC diagnostic ignored "-Wmissing-declarations"
|
||||||
|
# pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef __OPENCV_TEST_PRECOMP_HPP__
|
#ifndef __OPENCV_TEST_PRECOMP_HPP__
|
||||||
|
@ -40,6 +40,8 @@
|
|||||||
//
|
//
|
||||||
//M*/
|
//M*/
|
||||||
|
|
||||||
|
#include "precomp.hpp"
|
||||||
|
|
||||||
#define SHOW_DEBUG_IMAGES 0
|
#define SHOW_DEBUG_IMAGES 0
|
||||||
|
|
||||||
#include "opencv2/core/core.hpp"
|
#include "opencv2/core/core.hpp"
|
||||||
@ -49,12 +51,11 @@
|
|||||||
# include "opencv2/highgui/highgui.hpp"
|
# include "opencv2/highgui/highgui.hpp"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "precomp.hpp"
|
|
||||||
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
#include <limits>
|
||||||
|
|
||||||
|
#include "opencv2/core/internal.hpp"
|
||||||
#if defined(HAVE_EIGEN) && EIGEN_WORLD_VERSION == 3
|
#if defined(HAVE_EIGEN) && EIGEN_WORLD_VERSION == 3
|
||||||
# include <Eigen/Core>
|
|
||||||
# ifdef ANDROID
|
# ifdef ANDROID
|
||||||
template <typename Scalar> Scalar log2(Scalar v) { using std::log; return log(v)/log(Scalar(2)); }
|
template <typename Scalar> Scalar log2(Scalar v) { using std::log; return log(v)/log(Scalar(2)); }
|
||||||
# endif
|
# endif
|
||||||
@ -62,8 +63,6 @@
|
|||||||
# include <Eigen/Dense>
|
# include <Eigen/Dense>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <limits>
|
|
||||||
|
|
||||||
using namespace cv;
|
using namespace cv;
|
||||||
|
|
||||||
inline static
|
inline static
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
#ifdef __GNUC__
|
#ifdef __GNUC__
|
||||||
# pragma GCC diagnostic ignored "-Wmissing-declarations"
|
# pragma GCC diagnostic ignored "-Wmissing-declarations"
|
||||||
|
# pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef __OPENCV_TEST_PRECOMP_HPP__
|
#ifndef __OPENCV_TEST_PRECOMP_HPP__
|
||||||
|
@ -73,7 +73,7 @@ void eigen2cv( const Eigen::Matrix<_Tp, _rows, _cols, _options, _maxRows, _maxCo
|
|||||||
_src.copyTo(dst);
|
_src.copyTo(dst);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename _Tp, int _rows, int _cols, int _options, int _maxRows, int _maxCols>
|
template<typename _Tp, int _rows, int _cols, int _options, int _maxRows, int _maxCols>
|
||||||
void cv2eigen( const Mat& src,
|
void cv2eigen( const Mat& src,
|
||||||
Eigen::Matrix<_Tp, _rows, _cols, _options, _maxRows, _maxCols>& dst )
|
Eigen::Matrix<_Tp, _rows, _cols, _options, _maxRows, _maxCols>& dst )
|
||||||
@ -132,14 +132,14 @@ void cv2eigen( const Mat& src,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
template<typename _Tp>
|
template<typename _Tp>
|
||||||
void cv2eigen( const Mat& src,
|
void cv2eigen( const Mat& src,
|
||||||
Eigen::Matrix<_Tp, Eigen::Dynamic, 1>& dst )
|
Eigen::Matrix<_Tp, Eigen::Dynamic, 1>& dst )
|
||||||
{
|
{
|
||||||
CV_Assert(src.cols == 1);
|
CV_Assert(src.cols == 1);
|
||||||
dst.resize(src.rows);
|
dst.resize(src.rows);
|
||||||
|
|
||||||
if( !(dst.Flags & Eigen::RowMajorBit) )
|
if( !(dst.Flags & Eigen::RowMajorBit) )
|
||||||
{
|
{
|
||||||
Mat _dst(src.cols, src.rows, DataType<_Tp>::type,
|
Mat _dst(src.cols, src.rows, DataType<_Tp>::type,
|
||||||
@ -183,8 +183,8 @@ void cv2eigen( const Mat& src,
|
|||||||
src.convertTo(_dst, _dst.type());
|
src.convertTo(_dst, _dst.type());
|
||||||
CV_DbgAssert(_dst.data == (uchar*)dst.data());
|
CV_DbgAssert(_dst.data == (uchar*)dst.data());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
@ -156,6 +156,9 @@ CV_INLINE IppiSize ippiSize(int width, int height)
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_EIGEN
|
#ifdef HAVE_EIGEN
|
||||||
|
# if defined __GNUC__ && defined __APPLE__
|
||||||
|
# pragma GCC diagnostic ignored "-Wshadow"
|
||||||
|
# endif
|
||||||
# include <Eigen/Core>
|
# include <Eigen/Core>
|
||||||
# include "opencv2/core/eigen.hpp"
|
# include "opencv2/core/eigen.hpp"
|
||||||
#endif
|
#endif
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
#ifdef __GNUC__
|
#ifdef __GNUC__
|
||||||
# pragma GCC diagnostic ignored "-Wmissing-declarations"
|
# pragma GCC diagnostic ignored "-Wmissing-declarations"
|
||||||
|
# pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef __OPENCV_PERF_PRECOMP_HPP__
|
#ifndef __OPENCV_PERF_PRECOMP_HPP__
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
#ifdef __GNUC__
|
#ifdef __GNUC__
|
||||||
# pragma GCC diagnostic ignored "-Wmissing-declarations"
|
# pragma GCC diagnostic ignored "-Wmissing-declarations"
|
||||||
|
# pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef __OPENCV_TEST_PRECOMP_HPP__
|
#ifndef __OPENCV_TEST_PRECOMP_HPP__
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
#ifdef __GNUC__
|
#ifdef __GNUC__
|
||||||
# pragma GCC diagnostic ignored "-Wmissing-declarations"
|
# pragma GCC diagnostic ignored "-Wmissing-declarations"
|
||||||
|
# pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef __OPENCV_PERF_PRECOMP_HPP__
|
#ifndef __OPENCV_PERF_PRECOMP_HPP__
|
||||||
|
@ -41,6 +41,7 @@
|
|||||||
|
|
||||||
#include "precomp.hpp"
|
#include "precomp.hpp"
|
||||||
|
|
||||||
|
#include "opencv2/core/internal.hpp"
|
||||||
#if defined(HAVE_EIGEN) && EIGEN_WORLD_VERSION == 2
|
#if defined(HAVE_EIGEN) && EIGEN_WORLD_VERSION == 2
|
||||||
#include <Eigen/Array>
|
#include <Eigen/Array>
|
||||||
#endif
|
#endif
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
#ifdef __GNUC__
|
#ifdef __GNUC__
|
||||||
# pragma GCC diagnostic ignored "-Wmissing-declarations"
|
# pragma GCC diagnostic ignored "-Wmissing-declarations"
|
||||||
|
# pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef __OPENCV_TEST_PRECOMP_HPP__
|
#ifndef __OPENCV_TEST_PRECOMP_HPP__
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
#ifdef __GNUC__
|
#ifdef __GNUC__
|
||||||
# pragma GCC diagnostic ignored "-Wmissing-declarations"
|
# pragma GCC diagnostic ignored "-Wmissing-declarations"
|
||||||
|
# pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef __OPENCV_PERF_PRECOMP_HPP__
|
#ifndef __OPENCV_PERF_PRECOMP_HPP__
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
#ifdef __GNUC__
|
#ifdef __GNUC__
|
||||||
# pragma GCC diagnostic ignored "-Wmissing-declarations"
|
# pragma GCC diagnostic ignored "-Wmissing-declarations"
|
||||||
|
# pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef __OPENCV_PERF_CPU_PRECOMP_HPP__
|
#ifndef __OPENCV_PERF_CPU_PRECOMP_HPP__
|
||||||
|
@ -41,6 +41,7 @@
|
|||||||
|
|
||||||
#ifdef __GNUC__
|
#ifdef __GNUC__
|
||||||
# pragma GCC diagnostic ignored "-Wmissing-declarations"
|
# pragma GCC diagnostic ignored "-Wmissing-declarations"
|
||||||
|
# pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef __OPENCV_TEST_PRECOMP_HPP__
|
#ifndef __OPENCV_TEST_PRECOMP_HPP__
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
#ifdef __GNUC__
|
#ifdef __GNUC__
|
||||||
# pragma GCC diagnostic ignored "-Wmissing-declarations"
|
# pragma GCC diagnostic ignored "-Wmissing-declarations"
|
||||||
|
# pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef __OPENCV_PERF_PRECOMP_HPP__
|
#ifndef __OPENCV_PERF_PRECOMP_HPP__
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
#ifdef __GNUC__
|
#ifdef __GNUC__
|
||||||
# pragma GCC diagnostic ignored "-Wmissing-declarations"
|
# pragma GCC diagnostic ignored "-Wmissing-declarations"
|
||||||
|
# pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef __OPENCV_TEST_PRECOMP_HPP__
|
#ifndef __OPENCV_TEST_PRECOMP_HPP__
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
#ifdef __GNUC__
|
#ifdef __GNUC__
|
||||||
# pragma GCC diagnostic ignored "-Wmissing-declarations"
|
# pragma GCC diagnostic ignored "-Wmissing-declarations"
|
||||||
|
# pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef __OPENCV_PERF_PRECOMP_HPP__
|
#ifndef __OPENCV_PERF_PRECOMP_HPP__
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
#ifdef __GNUC__
|
#ifdef __GNUC__
|
||||||
# pragma GCC diagnostic ignored "-Wmissing-declarations"
|
# pragma GCC diagnostic ignored "-Wmissing-declarations"
|
||||||
|
# pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef __OPENCV_TEST_PRECOMP_HPP__
|
#ifndef __OPENCV_TEST_PRECOMP_HPP__
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
#ifdef __GNUC__
|
#ifdef __GNUC__
|
||||||
# pragma GCC diagnostic ignored "-Wmissing-declarations"
|
# pragma GCC diagnostic ignored "-Wmissing-declarations"
|
||||||
|
# pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef __OPENCV_TEST_PRECOMP_HPP__
|
#ifndef __OPENCV_TEST_PRECOMP_HPP__
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
#ifdef __GNUC__
|
#ifdef __GNUC__
|
||||||
# pragma GCC diagnostic ignored "-Wmissing-declarations"
|
# pragma GCC diagnostic ignored "-Wmissing-declarations"
|
||||||
|
# pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef __OPENCV_TEST_PRECOMP_HPP__
|
#ifndef __OPENCV_TEST_PRECOMP_HPP__
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
#ifdef __GNUC__
|
#ifdef __GNUC__
|
||||||
# pragma GCC diagnostic ignored "-Wmissing-declarations"
|
# pragma GCC diagnostic ignored "-Wmissing-declarations"
|
||||||
|
# pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef __OPENCV_PERF_PRECOMP_HPP__
|
#ifndef __OPENCV_PERF_PRECOMP_HPP__
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
#ifdef __GNUC__
|
#ifdef __GNUC__
|
||||||
# pragma GCC diagnostic ignored "-Wmissing-declarations"
|
# pragma GCC diagnostic ignored "-Wmissing-declarations"
|
||||||
|
# pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef __OPENCV_TEST_PRECOMP_HPP__
|
#ifndef __OPENCV_TEST_PRECOMP_HPP__
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
#ifdef __GNUC__
|
#ifdef __GNUC__
|
||||||
# pragma GCC diagnostic ignored "-Wmissing-declarations"
|
# pragma GCC diagnostic ignored "-Wmissing-declarations"
|
||||||
|
# pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef __OPENCV_PERF_PRECOMP_HPP__
|
#ifndef __OPENCV_PERF_PRECOMP_HPP__
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
#ifdef __GNUC__
|
#ifdef __GNUC__
|
||||||
# pragma GCC diagnostic ignored "-Wmissing-declarations"
|
# pragma GCC diagnostic ignored "-Wmissing-declarations"
|
||||||
|
# pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef __OPENCV_TEST_PRECOMP_HPP__
|
#ifndef __OPENCV_TEST_PRECOMP_HPP__
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
#ifdef __GNUC__
|
#ifdef __GNUC__
|
||||||
# pragma GCC diagnostic ignored "-Wmissing-declarations"
|
# pragma GCC diagnostic ignored "-Wmissing-declarations"
|
||||||
|
# pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef __OPENCV_PERF_PRECOMP_HPP__
|
#ifndef __OPENCV_PERF_PRECOMP_HPP__
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
#ifdef __GNUC__
|
#ifdef __GNUC__
|
||||||
# pragma GCC diagnostic ignored "-Wmissing-declarations"
|
# pragma GCC diagnostic ignored "-Wmissing-declarations"
|
||||||
|
# pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef __OPENCV_TEST_PRECOMP_HPP__
|
#ifndef __OPENCV_TEST_PRECOMP_HPP__
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
#ifdef __GNUC__
|
#ifdef __GNUC__
|
||||||
# pragma GCC diagnostic ignored "-Wmissing-declarations"
|
# pragma GCC diagnostic ignored "-Wmissing-declarations"
|
||||||
|
# pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef __OPENCV_PERF_PRECOMP_HPP__
|
#ifndef __OPENCV_PERF_PRECOMP_HPP__
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
#ifdef __GNUC__
|
#ifdef __GNUC__
|
||||||
# pragma GCC diagnostic ignored "-Wmissing-declarations"
|
# pragma GCC diagnostic ignored "-Wmissing-declarations"
|
||||||
|
# pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef __OPENCV_TEST_PRECOMP_HPP__
|
#ifndef __OPENCV_TEST_PRECOMP_HPP__
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
#ifdef __GNUC__
|
#ifdef __GNUC__
|
||||||
# pragma GCC diagnostic ignored "-Wmissing-declarations"
|
# pragma GCC diagnostic ignored "-Wmissing-declarations"
|
||||||
|
# pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef __OPENCV_VIDEO_PRECOMP_HPP__
|
#ifndef __OPENCV_VIDEO_PRECOMP_HPP__
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
#ifdef __GNUC__
|
#ifdef __GNUC__
|
||||||
# pragma GCC diagnostic ignored "-Wmissing-declarations"
|
# pragma GCC diagnostic ignored "-Wmissing-declarations"
|
||||||
|
# pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef __OPENCV_TEST_PRECOMP_HPP__
|
#ifndef __OPENCV_TEST_PRECOMP_HPP__
|
||||||
|
Loading…
Reference in New Issue
Block a user