From: abv <abv@opencascade.com>
Date: Tue, 4 Jun 2019 06:21:28 +0000 (+0300)
Subject: 0030764: Coding - warnings in Image_AlienPixMap.cxx when built with MSVC10
X-Git-Tag: V7_4_0_beta~126
X-Git-Url: http://git.dev.opencascade.org/gitweb/?a=commitdiff_plain;h=0616aa9ecf40aaa3f9f63a0d3500551dcf12a956;p=occt-copy.git

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).
---

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 <initguid.h>
   #include <wincodec.h>
+  // prevent warnings on MSVC10
+  #include <Standard_WarningsDisable.hxx>
+  #include <Standard_TypeDef.hxx>
+  #include <Standard_WarningsRestore.hxx>
   #undef min
   #undef max
 #endif
@@ -39,6 +42,7 @@
 #include <TCollection_AsciiString.hxx>
 #include <TCollection_ExtendedString.hxx>
 #include <OSD_OpenFile.hxx>
+
 #include <fstream>
 #include <algorithm>