commit d15750c0c7766ecab7022ea9b2f9e89a9132cbc2
author msarett <msarett@google.com> Fri Mar 18 15:48:49 2016 -0700
committer Commit bot <commit-bot@chromium.org> Fri Mar 18 15:48:49 2016 -0700
tree e697c7285402a9b32a1b5b390e20e73a253081c0
parent 07ec54d8e6c0e7e6ea11cde867c00bd29da79063

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/SampleLighting.cpp

diff --git a/samplecode/SampleLighting.cpp b/samplecode/SampleLighting.cpp
index 566ed7f..fa88e3e 100755
--- a/samplecode/SampleLighting.cpp
+++ b/samplecode/SampleLighting.cpp
@@ -5,11 +5,11 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
+#include "DecodeFile.h"
 #include "SampleCode.h"
 #include "Resources.h"
 
 #include "SkCanvas.h"
-#include "SkImageDecoder.h"
 #include "SkLightingShader.h"
 #include "SkPoint3.h"
 
@@ -39,9 +39,9 @@
 
     LightingView() {
         SkString diffusePath = GetResourcePath("brickwork-texture.jpg");
-        SkImageDecoder::DecodeFile(diffusePath.c_str(), &fDiffuseBitmap);
+        decode_file(diffusePath.c_str(), &fDiffuseBitmap);
         SkString normalPath = GetResourcePath("brickwork_normal-map.jpg");
-        SkImageDecoder::DecodeFile(normalPath.c_str(), &fNormalBitmap);
+        decode_file(normalPath.c_str(), &fNormalBitmap);
 
         fLightAngle = 0.0f;
         fColorFactor = 0.0f;