tools/Resources.cpp - Issue 1334033004: formalize generate->bitmap

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

Issue 1334033004: formalize generate->bitmap (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Created 5 years, 3 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/Resources.cpp

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

index a2a59029bcc1ad5861854017d00617b0addaa3e9..62b3f9fd0dbaaed934b023a6028172346bbe7c53 100644

--- a/tools/Resources.cpp

+++ b/tools/Resources.cpp

@@ -28,7 +28,8 @@ void SetResourcePath(const char* resource) {

bool GetResourceAsBitmap(const char* resource, SkBitmap* dst) {

SkString resourcePath = GetResourcePath(resource);

SkAutoTUnref<SkData> resourceData(SkData::NewFromFileName(resourcePath.c_str()));

- return resourceData && SkInstallDiscardablePixelRef(resourceData, dst);

+ SkAutoTDelete<SkImageGenerator> gen(SkImageGenerator::NewFromEncoded(resourceData));

+ return gen && gen->tryGenerateBitmap(dst);

hal.canary 2015/09/24 20:18:10 this no longer exercises discardable memory!

reed1 2015/09/25 08:05:16 Yes, discardable bitmaps is a deprecated feature.

}

SkImage* GetResourceAsImage(const char* resource) {

« no previous file with comments | « src/core/SkImageGenerator.cpp ('k') | no next file » | no next file with comments »