From c18143e89b8ef91cb0a3f64cb490ea765da3549f Mon Sep 17 00:00:00 2001 From: "bungeman@google.com" Date: Fri, 11 Jan 2013 20:02:32 +0000 Subject: [PATCH] SkImageDecoder_WIC should work on Win7 with Win8 SDK. https://codereview.appspot.com/7099044/ git-svn-id: http://skia.googlecode.com/svn/trunk@7139 2bbb7eff-a529-9590-31e7-b0007b416f81 --- src/ports/SkImageDecoder_WIC.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/ports/SkImageDecoder_WIC.cpp b/src/ports/SkImageDecoder_WIC.cpp index d83611f..e16f575 100644 --- a/src/ports/SkImageDecoder_WIC.cpp +++ b/src/ports/SkImageDecoder_WIC.cpp @@ -19,6 +19,15 @@ #include "SkTScopedComPtr.h" #include "SkUnPreMultiply.h" +//All Windows SDKs back to XPSP2 export the CLSID_WICImagingFactory symbol. +//In the Windows8 SDK the CLSID_WICImagingFactory symbol is still exported +//but CLSID_WICImagingFactory is then #defined to CLSID_WICImagingFactory2. +//Undo this #define if it has been done so that we link against the symbols +//we intended to link against on all SDKs. +#if defined(CLSID_WICImagingFactory) +#undef CLSID_WICImagingFactory +#endif + class SkImageDecoder_WIC : public SkImageDecoder { protected: virtual bool onDecode(SkStream* stream, SkBitmap* bm, Mode mode); -- 2.7.4