tools/picture_utils.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: tools/picture_utils.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: tools/picture_utils.cpp

diff --git a/tools/picture_utils.cpp b/tools/picture_utils.cpp

index d88d922af966b7348c169cb567912e0039da8543..597fd4878f338c75aa2e594141768b4e621fa017 100644

--- a/tools/picture_utils.cpp

+++ b/tools/picture_utils.cpp

@@ -17,8 +17,8 @@

namespace sk_tools {

void force_all_opaque(const SkBitmap& bitmap) {

SkASSERT(NULL == bitmap.getTexture());

- SkASSERT(SkBitmap::kARGB_8888_Config == bitmap.config());

- if (NULL != bitmap.getTexture() || SkBitmap::kARGB_8888_Config == bitmap.config()) {

+ SkASSERT(kN32_SkColorType == bitmap.colorType());

+ if (NULL != bitmap.getTexture() || kN32_SkColorType == bitmap.colorType()) {

return;

}