From 9bde918754bc292469d801f156f3b626eb3db780 Mon Sep 17 00:00:00 2001 From: msarett Date: Wed, 25 Mar 2015 05:27:48 -0700 Subject: Enabling ico decoding with use of png and bmp decoders BUG=skia:3257 NOPRESUBMIT=true Review URL: https://codereview.chromium.org/1011343003 --- src/codec/SkCodec_libpng.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/codec/SkCodec_libpng.cpp') diff --git a/src/codec/SkCodec_libpng.cpp b/src/codec/SkCodec_libpng.cpp index 57653e74df..e113a0e1b6 100644 --- a/src/codec/SkCodec_libpng.cpp +++ b/src/codec/SkCodec_libpng.cpp @@ -368,10 +368,10 @@ SkCodec::Result SkPngCodec::onGetPixels(const SkImageInfo& requestedInfo, void* if (!this->rewindIfNeeded()) { return kCouldNotRewind; } - if (requestedInfo.dimensions() != this->getOriginalInfo().dimensions()) { + if (requestedInfo.dimensions() != this->getInfo().dimensions()) { return kInvalidScale; } - if (!conversion_possible(requestedInfo, this->getOriginalInfo())) { + if (!conversion_possible(requestedInfo, this->getInfo())) { return kInvalidConversion; } @@ -424,7 +424,7 @@ SkCodec::Result SkPngCodec::onGetPixels(const SkImageInfo& requestedInfo, void* // told png to upscale. SkASSERT(PNG_COLOR_TYPE_GRAY == pngColorType); sc = SkSwizzler::kGray; - } else if (this->getOriginalInfo().alphaType() == kOpaque_SkAlphaType) { + } else if (this->getInfo().alphaType() == kOpaque_SkAlphaType) { sc = SkSwizzler::kRGBX; } else { sc = SkSwizzler::kRGBA; -- cgit v1.2.3