OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-05 18:16:23 +03:00
Code Packages Releases Activity

0030764: Coding - warnings in Image_AlienPixMap.cxx when built with MSVC10

Browse Source 
Disable warnings when including system headers (conflict between VS 2010 and Windows SDK definitions).
This commit is contained in:
abv 2019-06-04 09:21:28 +03:00 committed by bugmaster
parent 0ae9ac2179
commit 0616aa9ecf
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Image/Image_AlienPixMap.cxx
View File

@ -24,8 +24,11 @@
#pragma comment( lib, "FreeImage.lib" ) #pragma comment( lib, "FreeImage.lib" )
#endif #endif
#elif defined(HAVE_WINCODEC) #elif defined(HAVE_WINCODEC)
//#include <initguid.h>
#include <wincodec.h> #include <wincodec.h>
// prevent warnings on MSVC10
#include <Standard_WarningsDisable.hxx>
#include <Standard_TypeDef.hxx>
#include <Standard_WarningsRestore.hxx>
#undef min #undef min
#undef max #undef max
#endif #endif
@ -39,6 +42,7 @@
#include <TCollection_AsciiString.hxx> #include <TCollection_AsciiString.hxx>
#include <TCollection_ExtendedString.hxx> #include <TCollection_ExtendedString.hxx>
#include <OSD_OpenFile.hxx> #include <OSD_OpenFile.hxx>
#include <fstream> #include <fstream>
#include <algorithm> #include <algorithm>