Fix openexr build on MinGW

diff --git a/3rdparty/openexr/IlmImf/ImfAutoArray.h b/3rdparty/openexr/IlmImf/ImfAutoArray.h
index edb8b10..555205b 100644 (file)
--- 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 {
 
 

diff --git a/modules/highgui/src/grfmt_exr.cpp b/modules/highgui/src/grfmt_exr.cpp
index f01f1fd..9697cbc 100644 (file)
--- 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)