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 /samplecode/SampleIdentityScale.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 'samplecode/SampleIdentityScale.cpp')
| -rw-r--r-- | samplecode/SampleIdentityScale.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/samplecode/SampleIdentityScale.cpp b/samplecode/SampleIdentityScale.cpp index 2ec9112800..ad235416cd 100644 --- a/samplecode/SampleIdentityScale.cpp +++ b/samplecode/SampleIdentityScale.cpp @@ -25,11 +25,10 @@ class IdentityScaleView : public SampleView { public: IdentityScaleView(const char imageFilename[]) { - SkString resourcePath = GetResourcePath(imageFilename); - if (!decode_file(resourcePath.c_str(), &fBM)) { - fBM.allocN32Pixels(1, 1); - *(fBM.getAddr32(0,0)) = 0xFF0000FF; // red == bad - } + if (!DecodeDataToBitmap(GetResourceAsData(imageFilename), &fBM)) { + fBM.allocN32Pixels(1, 1); + *(fBM.getAddr32(0,0)) = 0xFF0000FF; // red == bad + } } protected: |