From d15750c0c7766ecab7022ea9b2f9e89a9132cbc2 Mon Sep 17 00:00:00 2001 From: msarett Date: Fri, 18 Mar 2016 15:48:49 -0700 Subject: Remove uses of SkImageDecoder from samplecode BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1812323003 Review URL: https://codereview.chromium.org/1812323003 --- samplecode/SampleAll.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'samplecode/SampleAll.cpp') diff --git a/samplecode/SampleAll.cpp b/samplecode/SampleAll.cpp index 7c0557fc40..2bbe29f383 100644 --- a/samplecode/SampleAll.cpp +++ b/samplecode/SampleAll.cpp @@ -21,7 +21,6 @@ #include "SkReadBuffer.h" #include "SkWriteBuffer.h" #include "SkGradientShader.h" -#include "SkImageDecoder.h" #include "SkLayerRasterizer.h" #include "SkMath.h" #include "SkPath.h" @@ -37,6 +36,7 @@ #include "SkXfermode.h" #include +#include "DecodeFile.h" static inline SkPMColor rgb2gray(SkPMColor c) { unsigned r = SkGetPackedR32(c); @@ -511,9 +511,9 @@ protected: } virtual void startTest() { - SkImageDecoder::DecodeFile("/Users/caryclark/Desktop/bugcirc.gif", &fBug); - SkImageDecoder::DecodeFile("/Users/caryclark/Desktop/tbcirc.gif", &fTb); - SkImageDecoder::DecodeFile("/Users/caryclark/Desktop/05psp04.gif", &fTx); + decode_file("/Users/caryclark/Desktop/bugcirc.gif", &fBug); + decode_file("/Users/caryclark/Desktop/tbcirc.gif", &fTb); + decode_file("/Users/caryclark/Desktop/05psp04.gif", &fTx); } void drawRaster(SkCanvas* canvas) { -- cgit v1.2.3