src/core/SkImageInfo.cpp - Issue 966753002: Revert of replace kIgnore_SkAlphaType with kUnknown_SkAlphaType

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/core/SkImageInfo.cpp

Issue 966753002: Revert of replace kIgnore_SkAlphaType with kUnknown_SkAlphaType (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Created 5 years, 10 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/core/SkImageInfo.cpp

diff --git a/src/core/SkImageInfo.cpp b/src/core/SkImageInfo.cpp

index 0e8b0b1292fab1ab702f32a8a1336f1400cec1f5..146a3aeed8b0a4a1b04af80f43cb0742e39069db 100644

--- a/src/core/SkImageInfo.cpp

+++ b/src/core/SkImageInfo.cpp

@@ -50,7 +50,7 @@

SkAlphaType* canonical) {

switch (colorType) {

case kUnknown_SkColorType:

- alphaType = kUnknown_SkAlphaType;

+ alphaType = kIgnore_SkAlphaType;

break;

case kAlpha_8_SkColorType:

if (kUnpremul_SkAlphaType == alphaType) {

@@ -61,7 +61,7 @@

case kARGB_4444_SkColorType:

case kRGBA_8888_SkColorType:

case kBGRA_8888_SkColorType:

- if (kUnknown_SkAlphaType == alphaType) {

+ if (kIgnore_SkAlphaType == alphaType) {

return false;

}

break;

« no previous file with comments | « src/core/SkConfig8888.cpp ('k') | src/utils/mac/SkCreateCGImageRef.cpp » ('j') | no next file with comments »