samplecode/SampleApp.cpp - Issue 233813004: 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: samplecode/SampleApp.cpp

Issue 233813004: 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: samplecode/SampleApp.cpp

diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp

index c8fbf3dd15e3e76608b62d2e1fad3cd40844de6e..050fc4aa8cecf825bc59e80e77e260f86a5411d2 100644

--- a/samplecode/SampleApp.cpp

+++ b/samplecode/SampleApp.cpp

@@ -958,7 +958,7 @@

fSlideMenu = new SkOSMenu;

this->addMenu(fSlideMenu);

- this->setColorType(kPMColor_SkColorType);

+ this->setColorType(kN32_SkColorType);

this->setVisibleP(true);

this->setClipToBounds(false);

@@ -1449,7 +1449,7 @@

SkBaseDevice* device = orig->getDevice();

SkBitmap bmp;

- if (device->accessBitmap(false).copyTo(&bmp, kPMColor_SkColorType)) {

+ if (device->accessBitmap(false).copyTo(&bmp, kN32_SkColorType)) {

static int gSampleGrabCounter;

SkString name;

name.printf("sample_grab_%d.png", gSampleGrabCounter++);

@@ -1552,7 +1552,7 @@

kUnknown_SkColorType, // none -> none

kUnknown_SkColorType, // a8 -> none

kARGB_4444_SkColorType, // 565 -> 4444

- kPMColor_SkColorType, // 4444 -> 8888

+ kN32_SkColorType, // 4444 -> 8888

kRGB_565_SkColorType, // 8888 -> 565

kUnknown_SkColorType, // index8 -> none

« no previous file with comments | « include/core/SkImageInfo.h ('k') | samplecode/SampleDitherBitmap.cpp » ('j') | no next file with comments »