src/images/SkImageDecoder_libwebp.cpp - Issue 25275004: store SkAlphaType inside SkBitmap, on road to support unpremul

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: src/images/SkImageDecoder_libwebp.cpp

Issue 25275004: store SkAlphaType inside SkBitmap, on road to support unpremul (Closed) Base URL: https://skia.googlecode.com/svn/trunk

Patch Set: Created 7 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: src/images/SkImageDecoder_libwebp.cpp

diff --git a/src/images/SkImageDecoder_libwebp.cpp b/src/images/SkImageDecoder_libwebp.cpp

index 625e96e42b7d16c3b7c8edbb4a24ae480f433a60..3373c033d0c710de1825f4fed1d541440bfe742b 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,