From d427266a58af7e6ea6c12c9cd56ade3e179a0c04 Mon Sep 17 00:00:00 2001 From: msarett Date: Thu, 17 Mar 2016 07:19:41 -0700 Subject: 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 Review URL: https://codereview.chromium.org/1791583002 --- gm/filterindiabox.cpp | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) (limited to 'gm/filterindiabox.cpp') diff --git a/gm/filterindiabox.cpp b/gm/filterindiabox.cpp index c5d7166423..569a694968 100644 --- a/gm/filterindiabox.cpp +++ b/gm/filterindiabox.cpp @@ -11,7 +11,6 @@ #include "SkBitmapProcState.h" #include "SkBitmapScaler.h" #include "SkGradientShader.h" -#include "SkImageDecoder.h" #include "SkImageEncoder.h" #include "SkStream.h" #include "SkTypeface.h" @@ -99,21 +98,11 @@ protected: } void makeBitmap() { - 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 (!GetResourceAsBitmap(fFilename.c_str(), &fBM)) { + fBM.allocN32Pixels(1, 1); + fBM.eraseARGB(255, 255, 0 , 0); // red == bad + } + fSize = fBM.height(); } private: typedef skiagm::GM INHERITED; -- cgit v1.2.3