diff options
author | 2015-03-25 05:27:48 -0700 | |
---|---|---|
committer | 2015-03-25 05:27:48 -0700 | |
commit | 9bde918754bc292469d801f156f3b626eb3db780 (patch) | |
tree | c59c3026e31c8712a415c5adba11dfd391329506 /src/codec/SkCodec_libpng.cpp | |
parent | 6adf849f4eedd19591ce35129a846209e7e6393b (diff) |
Enabling ico decoding with use of png and bmp decoders
BUG=skia:3257
NOPRESUBMIT=true
Review URL: https://codereview.chromium.org/1011343003
Diffstat (limited to 'src/codec/SkCodec_libpng.cpp')
-rw-r--r-- | src/codec/SkCodec_libpng.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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; |