diff options
author | Hal Canary <halcanary@google.com> | 2017-12-08 11:38:47 -0500 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-12-08 19:30:48 +0000 |
commit | 5093a539def3ae09df324018f2343827009b2e05 (patch) | |
tree | 0809099fad806dd9a8f00fe0e2dfcd8a958915af /tools/Resources.cpp | |
parent | 0b1b9c233a338ef26e7593c1423795c8ced53e1d (diff) |
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>
Diffstat (limited to 'tools/Resources.cpp')
-rw-r--r-- | tools/Resources.cpp | 35 |
1 files changed, 12 insertions, 23 deletions
diff --git a/tools/Resources.cpp b/tools/Resources.cpp index 948949bf04..6436a0ddb8 100644 --- a/tools/Resources.cpp +++ b/tools/Resources.cpp @@ -26,37 +26,26 @@ void SetResourcePath(const char* resource) { FLAGS_resourcePath.set(0, resource); } -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()) && + +bool DecodeDataToBitmap(sk_sp<SkData> data, SkBitmap* dst) { + std::unique_ptr<SkImageGenerator> gen(SkImageGenerator::MakeFromEncoded(std::move(data))); + return gen && 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) { - 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); + auto data = GetResourceAsData(resource); + return data ? std::unique_ptr<SkStreamAsset>(new SkMemoryStream(std::move(data))) + : nullptr; } sk_sp<SkData> GetResourceAsData(const char* resource) { - SkString resourcePath = GetResourcePath(resource); - return SkData::MakeFromFileName(resourcePath.c_str()); + auto data = SkData::MakeFromFileName(GetResourcePath(resource).c_str()); + if (!data) { + SkDebugf("Resource \"%s\" not found.\n", resource); + } + return data; } sk_sp<SkTypeface> MakeResourceAsTypeface(const char* resource) { |