diff options
| author |  piotaixr <piotaixr@chromium.org> | 2014-09-18 11:55:14 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-09-18 11:55:14 -0700 |
| commit | 0d276f71d2cf30f4a282cd4f470084c6b42c6af2 (patch) | |
| tree | e1b88dae7d911a90947783846a4b2b1ea13d5adf /gm | |
| parent | 0397e9f3415b4646797f1b17e9a38b5deb864ff0 (diff) | |
Bis: Use SkImage::NewFromGenerator() instead of SkImage::newEncodedData()
BUG=skia:2948
R=junov@chromium.org, reed@google.com
Author: piotaixr@chromium.org
Review URL: https://codereview.chromium.org/579923002
Diffstat (limited to 'gm')
| -rw-r--r-- | gm/image.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gm/image.cpp b/gm/image.cpp index e405a053b2..b775af8b89 100644 --- a/gm/image.cpp +++ b/gm/image.cpp @@ -8,6 +8,7 @@ #include "gm.h" #include "SkSurface.h" #include "SkCanvas.h" +#include "SkDecodingImageGenerator.h" #include "SkStream.h" #include "SkData.h" @@ -31,7 +32,8 @@ static void drawJpeg(SkCanvas* canvas, const SkISize& size) { // be exercised on machines other than mike's. Will require a // rebaseline. SkAutoDataUnref data(fileToData("/Users/mike/Downloads/skia.google.jpeg")); - SkImage* image = SkImage::NewEncodedData(data); + SkImage* image = SkImage::NewFromGenerator( + SkDecodingImageGenerator::Create(data, SkDecodingImageGenerator::Options())); if (image) { SkAutoCanvasRestore acr(canvas, true); canvas->scale(size.width() * 1.0f / image->width(), |