src/images/SkImageDecoder.cpp - Issue 338493005: stop using SkBitmap::Config

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

Issue 338493005: stop using SkBitmap::Config (Closed) Base URL: https://skia.googlesource.com/skia.git@master

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

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

index 3c6ff69982bf903f470079240c567b91a464e340..b12418750525f6d6dd9704752fd90873899c3247 100644

--- a/src/images/SkImageDecoder.cpp

+++ b/src/images/SkImageDecoder.cpp

@@ -209,7 +209,7 @@ bool SkImageDecoder::cropBitmap(SkBitmap *dst, SkBitmap *src, int sampleSize,

int srcX, int srcY) {

int w = width / sampleSize;

int h = height / sampleSize;

- if (src->config() == SkBitmap::kIndex8_Config) {

+ if (src->colorType() == kIndex_8_SkColorType) {

// kIndex8 does not allow drawing via an SkCanvas, as is done below.

// Instead, use extractSubset. Note that this shares the SkPixelRef and

// SkColorTable.