AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Try to work around VS2010 intsafe/stdint multiple define issues.

Browse Source 
git-svn-id: http://skia.googlecode.com/svn/trunk@11744 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
bungeman@google.com 2013-10-11 20:04:08 +00:00
parent 72e8324f0e
commit 85302969fc
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/ports/SkImageDecoder_WIC.cpp
View File

@ -6,9 +6,27 @@
* found in the LICENSE file. * found in the LICENSE file.
*/ */
#include "SkTypes.h"
// Workaround for:
// http://connect.microsoft.com/VisualStudio/feedback/details/621653/
// http://crbug.com/225822
// In VS2010 both intsafe.h and stdint.h define the following without guards.
// SkTypes brought in windows.h and stdint.h and the following defines are
// not used by this file. However, they may be re-introduced by wincodec.h.
#undef INT8_MIN
#undef INT16_MIN
#undef INT32_MIN
#undef INT64_MIN
#undef INT8_MAX
#undef UINT8_MAX
#undef INT16_MAX
#undef UINT16_MAX
#undef INT32_MAX
#undef UINT32_MAX
#undef INT64_MAX
#undef UINT64_MAX
#define WIN32_LEAN_AND_MEAN
#include <Windows.h>
#include <wincodec.h> #include <wincodec.h>
#include "SkAutoCoInitialize.h" #include "SkAutoCoInitialize.h"
#include "SkImageDecoder.h" #include "SkImageDecoder.h"