Fix openexr build on MinGW

13 years ago · 577d9cdece
parent 941391c0be
commit 577d9cdece
2 changed files with 5 additions and 1 deletions
--- 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)