Merge pull request #2061 from apavlenko:2.4_fix_build_vs12

f7b5e654 · Andrey Pavlenko · OpenCV Buildbot · 648faccc · 734bf8ba · 648faccc
Commit f7b5e654 authored Dec 26, 2013 by Andrey Pavlenko Committed by OpenCV Buildbot Dec 26, 2013
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

MultiMon.h 3rdparty/include/MultiMon.h +0 -0

window_w32.cpp modules/highgui/src/window_w32.cpp +0 -1

cv2.cpp modules/python/src2/cv2.cpp +5 -0

No files found.
--- a/3rdparty/include/MultiMon.h
+++ b/3rdparty/include/MultiMon.h
--- a/modules/highgui/src/window_w32.cpp
+++ b/modules/highgui/src/window_w32.cpp
@@ -61,7 +61,6 @@
 #ifdef __GNUC__
 #  pragma GCC diagnostic ignored "-Wmissing-declarations"
 #endif
-#include <MultiMon.h>
 #include <commctrl.h>
 #include <winuser.h>

--- a/modules/python/src2/cv2.cpp
+++ b/modules/python/src2/cv2.cpp
+#if defined(_MSC_VER) && (_MSC_VER >= 1800)
+// eliminating duplicated round() declaration
+#define HAVE_ROUND
+#endif
 #include <Python.h>
 #if !PYTHON_USE_NUMPY