Fix openexr build on MinGW

577d9cde · Andrey Kamaev · 941391c0 · 577d9cde · 577d9cde
Commit 577d9cde authored Aug 25, 2012 by Andrey Kamaev
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

ImfAutoArray.h 3rdparty/openexr/IlmImf/ImfAutoArray.h +4 -0

grfmt_exr.cpp modules/highgui/src/grfmt_exr.cpp +1 -1

No files found.
--- a/3rdparty/openexr/IlmImf/ImfAutoArray.h
+++ b/3rdparty/openexr/IlmImf/ImfAutoArray.h
@@ -46,6 +46,10 @@

 #include "OpenEXRConfig.h"

+#if !defined (HAVE_LARGE_STACK)
+#include <string.h>
+#endif
+
 namespace Imf {



--- a/modules/highgui/src/grfmt_exr.cpp
+++ b/modules/highgui/src/grfmt_exr.cpp
@@ -56,7 +56,7 @@
 #include <half.h>
 #include "grfmt_exr.hpp"

-#if defined _MSC_VER && _MSC_VER >= 1200
+#if defined _WIN32

 #undef UINT
 #define UINT ((Imf::PixelType)0)