From 003571887de747942478e33d4e2ff40bf3a65a72 Mon Sep 17 00:00:00 2001 From: bungeman Date: Thu, 17 Mar 2016 10:38:36 -0700 Subject: Revert of Remove uses of SkImageDecoder from gms (patchset #2 id:20001 of https://codereview.chromium.org/1791583002/ ) Reason for revert: Suspected of causing assertion failures in unrelated tests on Windows. Original issue's description: > 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 TBR=scroggo@google.com,reed@google.com,msarett@google.com # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Review URL: https://codereview.chromium.org/1806383002 --- gm/downsamplebitmap.cpp | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) (limited to 'gm/downsamplebitmap.cpp') diff --git a/gm/downsamplebitmap.cpp b/gm/downsamplebitmap.cpp index a99bae0cd9..771eb6ab53 100644 --- a/gm/downsamplebitmap.cpp +++ b/gm/downsamplebitmap.cpp @@ -10,6 +10,7 @@ #include "Resources.h" #include "SkGradientShader.h" #include "SkTypeface.h" +#include "SkImageDecoder.h" #include "SkStream.h" #include "SkPaint.h" @@ -170,11 +171,21 @@ class DownsampleBitmapImageGM: public DownsampleBitmapGM { int fSize; void make_bitmap() override { - if (!GetResourceAsBitmap(fFilename.c_str(), &fBM)) { - fBM.allocN32Pixels(1, 1); - fBM.eraseARGB(255, 255, 0 , 0); // red == bad - } - fSize = fBM.height(); + 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(); } private: typedef DownsampleBitmapGM INHERITED; -- cgit v1.2.3