src/images/SkDecodingImageGenerator.cpp - Issue 235523003: Revert of Revert of Rename kPMColor_SkColorType to kN32_SkColorType.

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/SkDecodingImageGenerator.cpp

Issue 235523003: Revert of Revert of Rename kPMColor_SkColorType to kN32_SkColorType. (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Created 6 years, 8 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:

View side-by-side diff with in-line comments

Download patch

Index: src/images/SkDecodingImageGenerator.cpp

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

index 5b842abf5f671da0c9d68dd1bdfec68cbf6f08c7..b3924a7daa4d2b342cb6ea29f333ce93aa4b7390 100644

--- a/src/images/SkDecodingImageGenerator.cpp

+++ b/src/images/SkDecodingImageGenerator.cpp

@@ -242,7 +242,7 @@

if (kIndex_8_SkColorType == bitmap.colorType()) {

// We don't support kIndex8 because we don't support

// colortables in this workflow.

- info.fColorType = kPMColor_SkColorType;

+ info.fColorType = kN32_SkColorType;

}

} else {

if (!bitmap.canCopyTo(opts.fRequestedColorType)) {

« no previous file with comments | « src/image/SkSurface_Raster.cpp ('k') | src/ports/SkImageDecoder_CG.cpp » ('j') | no next file with comments »