AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix bug in ico decodes

Browse Source 
Some icos have been looking a bit strange in Gold.

Looks like the cause was that we were decoding to kUnpremul
accidentally.

BUG=skia:

Review URL: https://codereview.chromium.org/1321913003
This commit is contained in:
msarett 2015-09-02 16:23:42 -07:00 committed by Commit bot
parent 613f20aa4b
commit d67d08ed33
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/codec/SkCodec_libico.cpp
View File

@ -255,10 +255,24 @@ SkCodec::Result SkIcoCodec::onGetPixels(const SkImageInfo& dstInfo,
if (dstInfo.dimensions() == embeddedCodec->getInfo().dimensions()) {
// Perform the decode
// FIXME: (msarett): ICO is considered non-opaque, even if the embedded BMP
// FIXME (msarett): ICO is considered non-opaque, even if the embedded BMP
// incorrectly claims it has no alpha.
SkImageInfo info = dstInfo.makeAlphaType(embeddedCodec->getInfo().alphaType());
result = embeddedCodec->getPixels(info, dst, dstRowBytes, &opts, ct, ptr);
SkAlphaType embeddedAlpha = embeddedCodec->getInfo().alphaType();
switch (embeddedAlpha) {
case kPremul_SkAlphaType:
case kUnpremul_SkAlphaType:
// Use the requested alpha type if the embedded codec supports alpha.
embeddedAlpha = dstInfo.alphaType();
break;
case kOpaque_SkAlphaType:
// If the embedded codec claims it is opaque, decode as if it is opaque.
break;
default:
SkASSERT(false);
break;
}
SkImageInfo info = dstInfo.makeAlphaType(embeddedAlpha);
result = embeddedCodec->getPixels(dstInfo, dst, dstRowBytes, &opts, ct, ptr);
// On a fatal error, keep trying to find an image to decode
if (kInvalidConversion == result || kInvalidInput == result ||