diff options
Diffstat (limited to 'tools/Resources.cpp')
-rw-r--r-- | tools/Resources.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/Resources.cpp b/tools/Resources.cpp index 6d3054ab33..899f5d2bc4 100644 --- a/tools/Resources.cpp +++ b/tools/Resources.cpp @@ -27,14 +27,14 @@ void SetResourcePath(const char* resource) { bool GetResourceAsBitmap(const char* resource, SkBitmap* dst) { SkString resourcePath = GetResourcePath(resource); - SkAutoTUnref<SkData> resourceData(SkData::NewFromFileName(resourcePath.c_str())); - SkAutoTDelete<SkImageGenerator> gen(SkImageGenerator::NewFromEncoded(resourceData)); + sk_sp<SkData> resourceData(SkData::MakeFromFileName(resourcePath.c_str())); + SkAutoTDelete<SkImageGenerator> gen(SkImageGenerator::NewFromEncoded(resourceData.get())); return gen && gen->tryGenerateBitmap(dst); } sk_sp<SkImage> GetResourceAsImage(const char* resource) { SkString path = GetResourcePath(resource); - sk_sp<SkData> resourceData(SkData::NewFromFileName(path.c_str())); + sk_sp<SkData> resourceData(SkData::MakeFromFileName(path.c_str())); return SkImage::MakeFromEncoded(resourceData); } |