samplecode/SamplePicture.cpp - Issue 108723003: Revert "Revert "PixelRef now returns (nearly) everything that is currently in SkBitmap. The goal is…

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

Issue 108723003: Revert "Revert "PixelRef now returns (nearly) everything that is currently in SkBitmap. The goal is… (Closed) Base URL: https://skia.googlecode.com/svn/trunk

Patch Set: fix warnings, update SkImageRef_ashmem Created 7 years 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/SamplePicture.cpp

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

index 66289affe0992219b6466051e622061aff94ce64..2f7d691d17af7b18aa64d556e59ffd9560b3982e 100644

--- a/samplecode/SamplePicture.cpp

+++ b/samplecode/SamplePicture.cpp

@@ -40,7 +40,9 @@ static SkBitmap load_bitmap() {

if (SkImageDecoder::DecodeStream(stream, &bm, SkBitmap::kNo_Config,

SkImageDecoder::kDecodeBounds_Mode)) {

- SkPixelRef* pr = new SkImageRef_GlobalPool(stream, bm.config(), 1);

+ SkImageInfo info;

+ bm.asImageInfo(&info);

+ SkPixelRef* pr = new SkImageRef_GlobalPool(info, stream, 1);

bm.setPixelRef(pr)->unref();

}

« no previous file with comments | « include/images/SkImageRef_GlobalPool.h ('k') | src/core/SkBitmap.cpp » ('j') | no next file with comments »