Remove uses of SkImageDecoder from samplecode

samplecode/SampleLighting.cpp

 
 /*
  * Copyright 2015 Google Inc.
  *
  * 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"
 
 static const SkLightingShader::Lights* create_lights(SkScalar angle, SkScalar blue) {
 
     const SkVector3 dir = SkVector3::Make(SkScalarSin(angle)*SkScalarSin(SK_ScalarPI*0.25f),
                                           SkScalarCos(angle)*SkScalarSin(SK_ScalarPI*0.25f),
                                           SkScalarCos(SK_ScalarPI*0.25f));
 
     SkLightingShader::Lights::Builder builder;
 
     builder.add(SkLight(SkColor3f::Make(1.0f, 1.0f, blue), dir));
     builder.add(SkLight(SkColor3f::Make(0.1f, 0.1f, 0.1f)));
 
     return builder.finish();
 }
 
 ////////////////////////////////////////////////////////////////////////////
 
 class LightingView : public SampleView {
 public:
     SkAutoTUnref<SkShader> fShader;
     SkBitmap               fDiffuseBitmap;
     SkBitmap               fNormalBitmap;
     SkScalar               fLightAngle;
     SkScalar               fColorFactor;
 
     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;
 
         SkAutoTUnref<const SkLightingShader::Lights> lights(create_lights(fLightAngle, 1.0f));
 
         fShader.reset(SkLightingShader::Create(fDiffuseBitmap, fNormalBitmap,
                                                lights, SkVector::Make(1.0f, 0.0f),
                                                nullptr, nullptr));
     }
@@ skipping 42 matching lines @@
     }
 
 private:
     typedef SampleView INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static SkView* MyFactory() { return new LightingView; }
 static SkViewRegister reg(MyFactory);