diff options
| author |  reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-21 14:00:07 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-21 14:00:07 +0000 |
| commit | 383a697692cf46951fd451f6f4c3d03634a6a1cb (patch) | |
| tree | a1dac6fe4fa0e4d34d032e70ff85503843ad39b8 /src/images/SkImageDecoder_libwebp.cpp | |
| parent | c2eae4795478ab134a2315b1a9ff2c5de1d049e4 (diff) | |
store SkAlphaType inside SkBitmap, on road to support unpremul
BUG=
R=bsalomon@google.com, scroggo@google.com
Review URL: https://codereview.chromium.org/25275004
git-svn-id: http://skia.googlecode.com/svn/trunk@11877 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/images/SkImageDecoder_libwebp.cpp')
| -rw-r--r-- | src/images/SkImageDecoder_libwebp.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/images/SkImageDecoder_libwebp.cpp b/src/images/SkImageDecoder_libwebp.cpp index 8bb716bae8..68014dd392 100644 --- a/src/images/SkImageDecoder_libwebp.cpp +++ b/src/images/SkImageDecoder_libwebp.cpp @@ -293,11 +293,8 @@ bool SkWEBPImageDecoder::setDecodeConfig(SkBitmap* decodedBitmap, return false; } - decodedBitmap->setConfig(config, width, height, 0); - - decodedBitmap->setIsOpaque(!fHasAlpha); - - return true; + return decodedBitmap->setConfig(config, width, height, 0, + fHasAlpha ? kPremul_SkAlphaType : kOpaque_SkAlphaType); } bool SkWEBPImageDecoder::onBuildTileIndex(SkStreamRewindable* stream, |