src/codec/SkBmpStandardCodec.cpp - Issue 1641273003: Support decoding opaque to *premul

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/codec/SkBmpStandardCodec.cpp

Issue 1641273003: Support decoding opaque to *premul (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: No need for alphaType parameter Created 4 years, 11 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/codec/SkBmpStandardCodec.cpp

diff --git a/src/codec/SkBmpStandardCodec.cpp b/src/codec/SkBmpStandardCodec.cpp

index 85b40778b6c1c8bc1ff38d4347a5592034b62b6c..0e2b72c14a0832e9251bd613a66964a2431f1de4 100644

--- a/src/codec/SkBmpStandardCodec.cpp

+++ b/src/codec/SkBmpStandardCodec.cpp

@@ -337,10 +337,10 @@ void SkBmpStandardCodec::decodeIcoMask(SkStream* stream, const SkImageInfo& dstI

}

-uint32_t SkBmpStandardCodec::onGetFillValue(SkColorType colorType, SkAlphaType alphaType) const {

+uint32_t SkBmpStandardCodec::onGetFillValue(SkColorType colorType) const {

const SkPMColor* colorPtr = get_color_ptr(fColorTable.get());

if (colorPtr) {

return get_color_table_fill_value(colorType, colorPtr, 0);

}

- return INHERITED::onGetFillValue(colorType, alphaType);

+ return INHERITED::onGetFillValue(colorType);

}