mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-07 17:44:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

MSVC: Slience external/meaningless warnings

Browse Source
This commit is contained in:
Hamdi Sahloul 2018-09-12 13:23:36 +09:00
parent 38f8fc6c82
commit 03b3be0f51
7 changed files with 51 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/calib3d/src/dls.cpp
View File

@ -7,8 +7,17 @@
# if defined __GNUC__ && defined __APPLE__ # if defined __GNUC__ && defined __APPLE__
# pragma GCC diagnostic ignored "-Wshadow" # pragma GCC diagnostic ignored "-Wshadow"
# endif # 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/Core>
# include <Eigen/Eigenvalues> # include <Eigen/Eigenvalues>
# if defined(_MSC_VER)
# pragma warning(pop)
# endif
# include "opencv2/core/eigen.hpp" # include "opencv2/core/eigen.hpp"
#endif #endif

9
modules/core/include/opencv2/core/private.hpp
View File

@ -57,7 +57,16 @@
# if defined __GNUC__ && defined __APPLE__ # if defined __GNUC__ && defined __APPLE__
# pragma GCC diagnostic ignored "-Wshadow" # pragma GCC diagnostic ignored "-Wshadow"
# endif # 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/Core>
# if defined(_MSC_VER)
# pragma warning(pop)
# endif
# include "opencv2/core/eigen.hpp" # include "opencv2/core/eigen.hpp"
#endif #endif

4
modules/core/src/cuda_stream.cpp
View File

@ -45,6 +45,10 @@
using namespace cv; using namespace cv;
using namespace cv::cuda; using namespace cv::cuda;
#if defined(_MSC_VER)
#pragma warning(disable : 4702) // unreachable code
#endif
///////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////
/// MemoryStack /// MemoryStack

15
modules/core/src/lapack.cpp
View File

@ -44,9 +44,18 @@
#include <limits> #include <limits>
#ifdef HAVE_EIGEN #ifdef HAVE_EIGEN
#include <Eigen/Core> # if defined(_MSC_VER)
#include <Eigen/Eigenvalues> # pragma warning(push)
#include "opencv2/core/eigen.hpp" # 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 #endif
#if defined _M_IX86 && defined _MSC_VER && _MSC_VER < 1700 #if defined _M_IX86 && defined _MSC_VER && _MSC_VER < 1700

4
modules/core/src/opengl.cpp
View File

@ -54,6 +54,10 @@
using namespace cv; using namespace cv;
using namespace cv::cuda; using namespace cv::cuda;
#if defined(_MSC_VER)
#pragma warning(disable : 4702) // unreachable code
#endif
namespace namespace
{ {
#ifndef HAVE_OPENGL #ifndef HAVE_OPENGL

11
modules/features2d/src/matchers.cpp
View File

@ -44,7 +44,16 @@
#include "opencl_kernels_features2d.hpp" #include "opencl_kernels_features2d.hpp"
#if defined(HAVE_EIGEN) && EIGEN_WORLD_VERSION == 2 #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 #endif
namespace cv namespace cv

5
modules/python/src2/cv2.cpp
View File

@ -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 // eliminating duplicated round() declaration
#define HAVE_ROUND 1 #define HAVE_ROUND 1
#pragma warning(push) #pragma warning(push)
@ -6,7 +7,7 @@
#endif #endif
#include <math.h> #include <math.h>
#include <Python.h> #include <Python.h>
#if defined(_MSC_VER) && (_MSC_VER >= 1800) #if defined(_MSC_VER) && (_MSC_VER > 1800)
#pragma warning(pop) #pragma warning(pop)
#endif #endif