Merge pull request #2061 from apavlenko:2.4_fix_build_vs12

2013-12-26 19:38:56 +04:00
parent 648facccd6 734bf8babd
commit f7b5e6544f
3 changed files with 5 additions and 503 deletions
--- 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
@@ -1,3 +1,8 @@
+#if defined(_MSC_VER) && (_MSC_VER >= 1800)
+// eliminating duplicated round() declaration
+#define HAVE_ROUND
+#endif
+
 #include <Python.h>

 #if !PYTHON_USE_NUMPY