From 577d9cdece0e20e13e3ee9f52a621d1b0d73ea9f Mon Sep 17 00:00:00 2001 From: Andrey Kamaev Date: Sat, 25 Aug 2012 18:13:59 +0400 Subject: [PATCH] Fix openexr build on MinGW --- 3rdparty/openexr/IlmImf/ImfAutoArray.h | 4 ++++ modules/highgui/src/grfmt_exr.cpp | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/3rdparty/openexr/IlmImf/ImfAutoArray.h b/3rdparty/openexr/IlmImf/ImfAutoArray.h index edb8b10..555205b 100644 --- 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 +#endif + namespace Imf { diff --git a/modules/highgui/src/grfmt_exr.cpp b/modules/highgui/src/grfmt_exr.cpp index f01f1fd..9697cbc 100644 --- a/modules/highgui/src/grfmt_exr.cpp +++ b/modules/highgui/src/grfmt_exr.cpp @@ -56,7 +56,7 @@ #include #include "grfmt_exr.hpp" -#if defined _MSC_VER && _MSC_VER >= 1200 +#if defined _WIN32 #undef UINT #define UINT ((Imf::PixelType)0) -- 2.7.4