diff options
author | msarett <msarett@google.com> | 2016-03-18 12:13:47 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-03-18 12:13:47 -0700 |
commit | e820dfebbc652bfc4a653f07a29f5fe371eb019b (patch) | |
tree | a0bcb4e0bea909195ec49c6221f6449ae8275c98 /gm/filterbitmap.cpp | |
parent | b5a94e3e24ef16f96ecfbe4ee427f7a0c69d7290 (diff) |
Remove uses of SkImageDecoder from gms
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1791583002
Committed: https://skia.googlesource.com/skia/+/d427266a58af7e6ea6c12c9cd56ade3e179a0c04
Review URL: https://codereview.chromium.org/1791583002
Diffstat (limited to 'gm/filterbitmap.cpp')
-rw-r--r-- | gm/filterbitmap.cpp | 32 |
1 files changed, 11 insertions, 21 deletions
diff --git a/gm/filterbitmap.cpp b/gm/filterbitmap.cpp index 5c63910a78..51a8064d80 100644 --- a/gm/filterbitmap.cpp +++ b/gm/filterbitmap.cpp @@ -9,7 +9,6 @@ #include "Resources.h" #include "SkGradientShader.h" -#include "SkImageDecoder.h" #include "SkStream.h" #include "SkTypeface.h" @@ -196,26 +195,17 @@ protected: } void makeBitmap() override { - SkImageDecoder* codec = nullptr; - SkString resourcePath = GetResourcePath(fFilename.c_str()); - SkFILEStream stream(resourcePath.c_str()); - if (stream.isValid()) { - codec = SkImageDecoder::Factory(&stream); - } - if (codec) { - stream.rewind(); - codec->decode(&stream, &fBM, kN32_SkColorType, SkImageDecoder::kDecodePixels_Mode); - delete codec; - } else { - fBM.allocN32Pixels(1, 1); - *(fBM.getAddr32(0,0)) = 0xFF0000FF; // red == bad - } - fSize = fBM.height(); - if (fConvertToG8) { - SkBitmap tmp; - fBM.copyTo(&tmp, kGray_8_SkColorType); - fBM = tmp; - } + if (!GetResourceAsBitmap(fFilename.c_str(), &fBM)) { + fBM.allocN32Pixels(1, 1); + fBM.eraseARGB(255, 255, 0 , 0); // red == bad + } + fSize = fBM.height(); + + if (fConvertToG8) { + SkBitmap tmp; + fBM.copyTo(&tmp, kGray_8_SkColorType); + fBM = tmp; + } } private: const bool fConvertToG8; |