From 0616aa9ecf40aaa3f9f63a0d3500551dcf12a956 Mon Sep 17 00:00:00 2001 From: abv Date: Tue, 4 Jun 2019 09:21:28 +0300 Subject: [PATCH] 0030764: Coding - warnings in Image_AlienPixMap.cxx when built with MSVC10 Disable warnings when including system headers (conflict between VS 2010 and Windows SDK definitions). --- src/Image/Image_AlienPixMap.cxx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Image/Image_AlienPixMap.cxx b/src/Image/Image_AlienPixMap.cxx index ba166a5fc6..0cbd6534d2 100644 --- a/src/Image/Image_AlienPixMap.cxx +++ b/src/Image/Image_AlienPixMap.cxx @@ -24,8 +24,11 @@ #pragma comment( lib, "FreeImage.lib" ) #endif #elif defined(HAVE_WINCODEC) - //#include #include + // prevent warnings on MSVC10 + #include + #include + #include #undef min #undef max #endif @@ -39,6 +42,7 @@ #include #include #include + #include #include