diff options
author | Ben Wagner <bungeman@google.com> | 2016-11-03 14:40:50 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-11-03 19:03:40 +0000 |
commit | 145dbcd165d9d27298eb8888bc240e2d06a95464 (patch) | |
tree | 461ac2a3fe607bdf1d72fd72ae9451a58490a1bc /tools/Resources.cpp | |
parent | b1c7f88df9ec40b4efb52d314304adfbaf95697c (diff) |
Remove SkAutoTDelete.
Replace with std::unique_ptr.
Change-Id: I5806cfbb30515fcb20e5e66ce13fb5f3b8728176
Reviewed-on: https://skia-review.googlesource.com/4381
Commit-Queue: Ben Wagner <bungeman@google.com>
Reviewed-by: Mike Klein <mtklein@chromium.org>
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 9c12a67c20..dcca202e42 100644 --- a/tools/Resources.cpp +++ b/tools/Resources.cpp @@ -28,7 +28,7 @@ void SetResourcePath(const char* resource) { bool GetResourceAsBitmap(const char* resource, SkBitmap* dst) { SkString resourcePath = GetResourcePath(resource); sk_sp<SkData> resourceData(SkData::MakeFromFileName(resourcePath.c_str())); - SkAutoTDelete<SkImageGenerator> gen(SkImageGenerator::NewFromEncoded(resourceData.get())); + std::unique_ptr<SkImageGenerator> gen(SkImageGenerator::NewFromEncoded(resourceData.get())); return gen && gen->tryGenerateBitmap(dst); } @@ -40,7 +40,7 @@ sk_sp<SkImage> GetResourceAsImage(const char* resource) { SkStreamAsset* GetResourceAsStream(const char* resource) { SkString resourcePath = GetResourcePath(resource); - SkAutoTDelete<SkFILEStream> stream(new SkFILEStream(resourcePath.c_str())); + std::unique_ptr<SkFILEStream> stream(new SkFILEStream(resourcePath.c_str())); if (!stream->isValid()) { SkDebugf("Resource %s not found.\n", resource); return nullptr; @@ -49,7 +49,7 @@ SkStreamAsset* GetResourceAsStream(const char* resource) { } sk_sp<SkTypeface> MakeResourceAsTypeface(const char* resource) { - SkAutoTDelete<SkStreamAsset> stream(GetResourceAsStream(resource)); + std::unique_ptr<SkStreamAsset> stream(GetResourceAsStream(resource)); if (!stream) { return nullptr; } |