Merge pull request #146 from taka-no-me/win_opengl

2012-11-13 18:19:42 +04:00 · 2012-11-13 18:19:42 +04:00 · 8ba9289a2c
commit 8ba9289a2c
parent 4d6bdc1533 8c9c2b3a03
1 changed files with 8 additions and 0 deletions
--- a/modules/core/src/opengl_interop.cpp
+++ b/modules/core/src/opengl_interop.cpp
@ -45,6 +45,14 @@
 #include "opencv2/core/opengl_interop.hpp"
 #include "opencv2/core/gpumat.hpp"

+#if defined WIN32 || defined _WIN32 || defined WINCE
+#include <windows.h>
+#undef small
+#undef min
+#undef max
+#undef abs
+#endif
+
 #ifdef HAVE_OPENGL
    #ifdef __APPLE__
        #include <OpenGL/gl.h>