diff options
Diffstat (limited to 'src/codec/SkCodec.cpp')
| -rw-r--r-- | src/codec/SkCodec.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/codec/SkCodec.cpp b/src/codec/SkCodec.cpp index 8468f8a099..955c86d609 100644 --- a/src/codec/SkCodec.cpp +++ b/src/codec/SkCodec.cpp @@ -13,7 +13,7 @@ #include "SkGifCodec.h" #include "SkIcoCodec.h" #include "SkJpegCodec.h" -#ifdef SK_CODEC_DECODES_PNG +#ifdef SK_HAS_PNG_LIBRARY #include "SkPngCodec.h" #endif #include "SkRawCodec.h" @@ -27,16 +27,16 @@ struct DecoderProc { }; static const DecoderProc gDecoderProcs[] = { -#ifdef SK_CODEC_DECODES_JPEG +#ifdef SK_HAS_JPEG_LIBRARY { SkJpegCodec::IsJpeg, SkJpegCodec::NewFromStream }, #endif -#ifdef SK_CODEC_DECODES_WEBP +#ifdef SK_HAS_WEBP_LIBRARY { SkWebpCodec::IsWebp, SkWebpCodec::NewFromStream }, #endif -#ifdef SK_CODEC_DECODES_GIF +#ifdef SK_HAS_GIF_LIBRARY { SkGifCodec::IsGif, SkGifCodec::NewFromStream }, #endif -#ifdef SK_CODEC_DECODES_PNG +#ifdef SK_HAS_PNG_LIBRARY { SkIcoCodec::IsIco, SkIcoCodec::NewFromStream }, #endif { SkBmpCodec::IsBmp, SkBmpCodec::NewFromStream }, @@ -86,7 +86,7 @@ SkCodec* SkCodec::NewFromStream(SkStream* stream, // PNG is special, since we want to be able to supply an SkPngChunkReader. // But this code follows the same pattern as the loop. -#ifdef SK_CODEC_DECODES_PNG +#ifdef SK_HAS_PNG_LIBRARY if (SkPngCodec::IsPng(buffer, bytesRead)) { return SkPngCodec::NewFromStream(streamDeleter.release(), chunkReader); } else |