diff options
| author |  msarett <msarett@google.com> | 2016-03-18 15:48:49 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-18 15:48:49 -0700 |
| commit | d15750c0c7766ecab7022ea9b2f9e89a9132cbc2 (patch) | |
| tree | e697c7285402a9b32a1b5b390e20e73a253081c0 /samplecode/SampleCamera.cpp | |
| parent | 07ec54d8e6c0e7e6ea11cde867c00bd29da79063 (diff) | |
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
Diffstat (limited to 'samplecode/SampleCamera.cpp')
| -rw-r--r-- | samplecode/SampleCamera.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/samplecode/SampleCamera.cpp b/samplecode/SampleCamera.cpp index b860917f3f..ed6cc52829 100644 --- a/samplecode/SampleCamera.cpp +++ b/samplecode/SampleCamera.cpp @@ -5,6 +5,7 @@ * found in the LICENSE file. */ +#include "DecodeFile.h" #include "SampleCode.h" #include "SkAnimTimer.h" #include "SkView.h" @@ -17,7 +18,6 @@ #include "SkShader.h" #include "SkUtils.h" #include "SkRandom.h" -#include "SkImageDecoder.h" class CameraView : public SampleView { SkTDArray<SkShader*> fShaders; @@ -33,7 +33,7 @@ public: SkString str; str.printf("/skimages/elephant%d.jpeg", i); SkBitmap bm; - if (SkImageDecoder::DecodeFile(str.c_str(), &bm)) { + if (decode_file(str.c_str(), &bm)) { SkRect src = { 0, 0, SkIntToScalar(bm.width()), SkIntToScalar(bm.height()) }; SkRect dst = { -150, -150, 150, 150 }; SkMatrix matrix; |