diff options
author | Mike Reed <reed@google.com> | 2017-12-08 21:09:12 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-12-08 21:09:19 +0000 |
commit | cca230055921d2df8708ed6f9abcc2d43468dc7f (patch) | |
tree | de54889d81021104dc9394680903db87994ebfe5 /tools/Resources.cpp | |
parent | 27372888a5c7698f51069bd5b5beea3e85b66668 (diff) |
Revert "resources: remove most uses of GetResourcePath()"
This reverts commit 5093a539def3ae09df324018f2343827009b2e05.
Reason for revert: google3 seems broken
Original change's description:
> resources: remove most uses of GetResourcePath()
>
> Going forward, we will standardize on GetResourceAsData(), which will
> make it easier to run tests in environments without access to the
> filesystem.
>
> Also: GetResourceAsData() complains when a resource is missing.
> This is usually an error.
>
> Change-Id: Iaf70b71b0ca5ed8cd1a5538a60ef185ae8736188
> Reviewed-on: https://skia-review.googlesource.com/82642
> Reviewed-by: Hal Canary <halcanary@google.com>
> Commit-Queue: Hal Canary <halcanary@google.com>
TBR=halcanary@google.com,scroggo@google.com
Change-Id: Ic5a7c0167c995a672e6b06dc92abe00564432214
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/83001
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'tools/Resources.cpp')
-rw-r--r-- | tools/Resources.cpp | 35 |
1 files changed, 23 insertions, 12 deletions
diff --git a/tools/Resources.cpp b/tools/Resources.cpp index 6436a0ddb8..948949bf04 100644 --- a/tools/Resources.cpp +++ b/tools/Resources.cpp @@ -26,26 +26,37 @@ void SetResourcePath(const char* resource) { FLAGS_resourcePath.set(0, resource); } - -bool DecodeDataToBitmap(sk_sp<SkData> data, SkBitmap* dst) { - std::unique_ptr<SkImageGenerator> gen(SkImageGenerator::MakeFromEncoded(std::move(data))); - return gen && dst->tryAllocPixels(gen->getInfo()) && +bool GetResourceAsBitmap(const char* resource, SkBitmap* dst) { + SkString resourcePath = GetResourcePath(resource); + sk_sp<SkData> resourceData(SkData::MakeFromFileName(resourcePath.c_str())); + std::unique_ptr<SkImageGenerator> gen(SkImageGenerator::MakeFromEncoded(resourceData)); + if (!gen) { + return false; + } + return dst->tryAllocPixels(gen->getInfo()) && gen->getPixels(gen->getInfo().makeColorSpace(nullptr), dst->getPixels(), dst->rowBytes(), nullptr); } +sk_sp<SkImage> GetResourceAsImage(const char* resource) { + SkString path = GetResourcePath(resource); + sk_sp<SkData> resourceData(SkData::MakeFromFileName(path.c_str())); + return SkImage::MakeFromEncoded(resourceData); +} + std::unique_ptr<SkStreamAsset> GetResourceAsStream(const char* resource) { - auto data = GetResourceAsData(resource); - return data ? std::unique_ptr<SkStreamAsset>(new SkMemoryStream(std::move(data))) - : nullptr; + SkString resourcePath = GetResourcePath(resource); + auto stream = SkFILEStream::Make(resourcePath.c_str()); + if (!stream) { + SkDebugf("Resource %s not found.\n", resource); + return nullptr; + } + return std::move(stream); } sk_sp<SkData> GetResourceAsData(const char* resource) { - auto data = SkData::MakeFromFileName(GetResourcePath(resource).c_str()); - if (!data) { - SkDebugf("Resource \"%s\" not found.\n", resource); - } - return data; + SkString resourcePath = GetResourcePath(resource); + return SkData::MakeFromFileName(resourcePath.c_str()); } sk_sp<SkTypeface> MakeResourceAsTypeface(const char* resource) { |