mirror of
https://github.com/opencv/opencv.git
synced 2025-06-07 17:44:04 +08:00
MSVC: Slience external/meaningless warnings
This commit is contained in:
parent
38f8fc6c82
commit
03b3be0f51
@ -7,8 +7,17 @@
|
||||
# if defined __GNUC__ && defined __APPLE__
|
||||
# pragma GCC diagnostic ignored "-Wshadow"
|
||||
# endif
|
||||
# if defined(_MSC_VER)
|
||||
# pragma warning(push)
|
||||
# pragma warning(disable:4701) // potentially uninitialized local variable
|
||||
# pragma warning(disable:4702) // unreachable code
|
||||
# pragma warning(disable:4714) // const marked as __forceinline not inlined
|
||||
# endif
|
||||
# include <Eigen/Core>
|
||||
# include <Eigen/Eigenvalues>
|
||||
# if defined(_MSC_VER)
|
||||
# pragma warning(pop)
|
||||
# endif
|
||||
# include "opencv2/core/eigen.hpp"
|
||||
#endif
|
||||
|
||||
|
@ -57,7 +57,16 @@
|
||||
# if defined __GNUC__ && defined __APPLE__
|
||||
# pragma GCC diagnostic ignored "-Wshadow"
|
||||
# endif
|
||||
# if defined(_MSC_VER)
|
||||
# pragma warning(push)
|
||||
# pragma warning(disable:4701) // potentially uninitialized local variable
|
||||
# pragma warning(disable:4702) // unreachable code
|
||||
# pragma warning(disable:4714) // const marked as __forceinline not inlined
|
||||
# endif
|
||||
# include <Eigen/Core>
|
||||
# if defined(_MSC_VER)
|
||||
# pragma warning(pop)
|
||||
# endif
|
||||
# include "opencv2/core/eigen.hpp"
|
||||
#endif
|
||||
|
||||
|
@ -45,6 +45,10 @@
|
||||
using namespace cv;
|
||||
using namespace cv::cuda;
|
||||
|
||||
#if defined(_MSC_VER)
|
||||
#pragma warning(disable : 4702) // unreachable code
|
||||
#endif
|
||||
|
||||
/////////////////////////////////////////////////////////////
|
||||
/// MemoryStack
|
||||
|
||||
|
@ -44,9 +44,18 @@
|
||||
#include <limits>
|
||||
|
||||
#ifdef HAVE_EIGEN
|
||||
#include <Eigen/Core>
|
||||
#include <Eigen/Eigenvalues>
|
||||
#include "opencv2/core/eigen.hpp"
|
||||
# if defined(_MSC_VER)
|
||||
# pragma warning(push)
|
||||
# pragma warning(disable:4701) // potentially uninitialized local variable
|
||||
# pragma warning(disable:4702) // unreachable code
|
||||
# pragma warning(disable:4714) // const marked as __forceinline not inlined
|
||||
# endif
|
||||
# include <Eigen/Core>
|
||||
# include <Eigen/Eigenvalues>
|
||||
# if defined(_MSC_VER)
|
||||
# pragma warning(pop)
|
||||
# endif
|
||||
# include "opencv2/core/eigen.hpp"
|
||||
#endif
|
||||
|
||||
#if defined _M_IX86 && defined _MSC_VER && _MSC_VER < 1700
|
||||
|
@ -54,6 +54,10 @@
|
||||
using namespace cv;
|
||||
using namespace cv::cuda;
|
||||
|
||||
#if defined(_MSC_VER)
|
||||
#pragma warning(disable : 4702) // unreachable code
|
||||
#endif
|
||||
|
||||
namespace
|
||||
{
|
||||
#ifndef HAVE_OPENGL
|
||||
|
@ -44,7 +44,16 @@
|
||||
#include "opencl_kernels_features2d.hpp"
|
||||
|
||||
#if defined(HAVE_EIGEN) && EIGEN_WORLD_VERSION == 2
|
||||
#include <Eigen/Array>
|
||||
# if defined(_MSC_VER)
|
||||
# pragma warning(push)
|
||||
# pragma warning(disable:4701) // potentially uninitialized local variable
|
||||
# pragma warning(disable:4702) // unreachable code
|
||||
# pragma warning(disable:4714) // const marked as __forceinline not inlined
|
||||
# endif
|
||||
# include <Eigen/Array>
|
||||
# if defined(_MSC_VER)
|
||||
# pragma warning(pop)
|
||||
# endif
|
||||
#endif
|
||||
|
||||
namespace cv
|
||||
|
@ -1,4 +1,5 @@
|
||||
#if defined(_MSC_VER) && (_MSC_VER >= 1800)
|
||||
//warning number '5033' not a valid compiler warning in vc12
|
||||
#if defined(_MSC_VER) && (_MSC_VER > 1800)
|
||||
// eliminating duplicated round() declaration
|
||||
#define HAVE_ROUND 1
|
||||
#pragma warning(push)
|
||||
@ -6,7 +7,7 @@
|
||||
#endif
|
||||
#include <math.h>
|
||||
#include <Python.h>
|
||||
#if defined(_MSC_VER) && (_MSC_VER >= 1800)
|
||||
#if defined(_MSC_VER) && (_MSC_VER > 1800)
|
||||
#pragma warning(pop)
|
||||
#endif
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user