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

8ba9289a · Andrey Kamaev · 4d6bdc15 · 8c9c2b3a · 8ba9289a
Commit 8ba9289a authored Nov 13, 2012 by Andrey Kamaev
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 0 deletions

opengl_interop.cpp modules/core/src/opengl_interop.cpp +8 -0

No files found.
--- 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>