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/SampleFilter2.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/SampleFilter2.cpp')
| -rw-r--r-- | samplecode/SampleFilter2.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/samplecode/SampleFilter2.cpp b/samplecode/SampleFilter2.cpp index 3663f11971..8c93563c40 100644 --- a/samplecode/SampleFilter2.cpp +++ b/samplecode/SampleFilter2.cpp @@ -5,12 +5,12 @@ * found in the LICENSE file. */ +#include "DecodeFile.h" #include "SampleCode.h" #include "SkView.h" #include "SkCanvas.h" #include "SkGradientShader.h" #include "SkGraphics.h" -#include "SkImageDecoder.h" #include "SkPath.h" #include "SkRegion.h" #include "SkShader.h" @@ -35,12 +35,10 @@ public: fBitmaps = new SkBitmap[fBitmapCount]; for (int i = 0; i < fBitmapCount/2; i++) { - SkImageDecoder::DecodeFile(gNames[i], &fBitmaps[i], kN32_SkColorType, - SkImageDecoder::kDecodePixels_Mode, nullptr); + decode_file(gNames[i], &fBitmaps[i]); } for (int i = fBitmapCount/2; i < fBitmapCount; i++) { - SkImageDecoder::DecodeFile(gNames[i-fBitmapCount/2], &fBitmaps[i], kRGB_565_SkColorType, - SkImageDecoder::kDecodePixels_Mode, nullptr); + decode_file(gNames[i-fBitmapCount/2], &fBitmaps[i], kRGB_565_SkColorType); } fCurrIndex = 0; |