| Index: tools/Resources.cpp
|
| diff --git a/tools/Resources.cpp b/tools/Resources.cpp
|
| index ecbf88c17ae924eefe9b67ecc164c06ae7680c44..0117404ac27fda9c7933a085ad405fe8e99ed6fe 100644
|
| --- a/tools/Resources.cpp
|
| +++ b/tools/Resources.cpp
|
| @@ -32,10 +32,10 @@ bool GetResourceAsBitmap(const char* resource, SkBitmap* dst) {
|
| return gen && gen->tryGenerateBitmap(dst);
|
| }
|
|
|
| -SkImage* GetResourceAsImage(const char* resource) {
|
| +sk_sp<SkImage> GetResourceAsImage(const char* resource) {
|
| SkString path = GetResourcePath(resource);
|
| - SkAutoTUnref<SkData> resourceData(SkData::NewFromFileName(path.c_str()));
|
| - return SkImage::NewFromEncoded(resourceData);
|
| + sk_sp<SkData> resourceData(SkData::NewFromFileName(path.c_str()));
|
| + return SkImage::MakeFromEncoded(resourceData);
|
| }
|
|
|
| SkStreamAsset* GetResourceAsStream(const char* resource) {
|
|
|