gm/blend.cpp - Issue 1784563002: unify peekPixels around pixmap parameter

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: gm/blend.cpp

Issue 1784563002: unify peekPixels around pixmap parameter (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: update GrUploadPixmapToTexture to know about the new desc if readPixels was called Created 4 years, 9 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: gm/blend.cpp

diff --git a/gm/blend.cpp b/gm/blend.cpp

index 94dc4c7f75fafceb314342f67ab8de97eee0de1e..6ecea4c8e918f73ab25647805ffc7ee5c33fd86d 100644

--- a/gm/blend.cpp

+++ b/gm/blend.cpp

@@ -36,7 +36,8 @@ DEF_SIMPLE_GM(blend, canvas, 300, 100) {

// Print out the colors in each block (if we're looking at 8888 raster).

if (canvas->imageInfo().colorType() == kN32_SkColorType) {

- if (const SkPMColor* px = (const SkPMColor*)canvas->peekPixels(nullptr, nullptr)) {

+ SkPixmap pmap;

+ if (const SkPMColor* px = canvas->peekPixels(&pmap) ? pmap.addr32() : nullptr) {

p.setColor(SK_ColorWHITE);

for (int i = 0; i < 3; i++) {

SkPMColor c = px[i * 100];

« no previous file with comments | « example/HelloWorld.cpp ('k') | include/core/SkCanvas.h » ('j') | no next file with comments »