From f9aa148ba9f6b4bb1ad0e9f56014547b3a525bb7 Mon Sep 17 00:00:00 2001 From: Andrey Pavlenko Date: Thu, 26 Dec 2013 13:35:59 +0400 Subject: [PATCH] eliminating VS2013 build warnings --- modules/highgui/src/window_w32.cpp | 3 +++ modules/python/src2/cv2.cpp | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/modules/highgui/src/window_w32.cpp b/modules/highgui/src/window_w32.cpp index a274fdbbc2..959292f279 100644 --- a/modules/highgui/src/window_w32.cpp +++ b/modules/highgui/src/window_w32.cpp @@ -61,7 +61,10 @@ #ifdef __GNUC__ # pragma GCC diagnostic ignored "-Wmissing-declarations" #endif + +#if defined(_MSC_VER) && (_MSC_VER < 1700) #include +#endif #include #include diff --git a/modules/python/src2/cv2.cpp b/modules/python/src2/cv2.cpp index 3c28555b77..8a0aa09759 100644 --- a/modules/python/src2/cv2.cpp +++ b/modules/python/src2/cv2.cpp @@ -1,3 +1,8 @@ +#if defined(_MSC_VER) && (_MSC_VER >= 1800) +// eliminating duplicated round() declaration +#define HAVE_ROUND +#endif + #include #if !PYTHON_USE_NUMPY -- GitLab