aboutsummaryrefslogtreecommitdiffhomepage
path: root/samplecode/SampleLighting.cpp
diff options
context:
space:
mode:
authorGravatar msarett <msarett@google.com>2016-03-18 15:48:49 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-03-18 15:48:49 -0700
commitd15750c0c7766ecab7022ea9b2f9e89a9132cbc2 (patch)
treee697c7285402a9b32a1b5b390e20e73a253081c0 /samplecode/SampleLighting.cpp
parent07ec54d8e6c0e7e6ea11cde867c00bd29da79063 (diff)
Remove uses of SkImageDecoder from samplecode
Diffstat (limited to 'samplecode/SampleLighting.cpp')
-rwxr-xr-xsamplecode/SampleLighting.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/samplecode/SampleLighting.cpp b/samplecode/SampleLighting.cpp
index 566ed7f909..fa88e3ecd6 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 @@ public:
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;