diff options
| author |  msarett <msarett@google.com> | 2016-03-22 08:58:35 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-22 08:58:35 -0700 |
| commit | 1088db92348baa013511a49392178fccf03e8008 (patch) | |
| tree | 7321dacc53dc5d0b390e03205c96a596749a2ef2 /src/codec/SkBmpStandardCodec.cpp | |
| parent | 4c9776b046dd5e9e46e2d1ce35154855c8fcb381 (diff) | |
Refactor SkBmpCodec
I started working on indicating the native encoded formats
and things got really complicated for bmp. I think starting
with this refactor may help a little, and I also think that
this is a good change by itself.
BUG=skia:4133
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1820283002
Review URL: https://codereview.chromium.org/1820283002
Diffstat (limited to 'src/codec/SkBmpStandardCodec.cpp')
| -rw-r--r-- | src/codec/SkBmpStandardCodec.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/codec/SkBmpStandardCodec.cpp b/src/codec/SkBmpStandardCodec.cpp index 39d357be8b..80a989ae4d 100644 --- a/src/codec/SkBmpStandardCodec.cpp +++ b/src/codec/SkBmpStandardCodec.cpp @@ -228,7 +228,7 @@ int SkBmpStandardCodec::decodeRows(const SkImageInfo& dstInfo, void* dst, size_t fSwizzler->swizzle(dstRow, fSrcBuffer.get()); } - if (fInIco) { + if (fInIco && fIsOpaque) { const int startScanline = this->currScanline(); if (startScanline < 0) { // We are not performing a scanline decode. |