| Index: samplecode/SamplePicture.cpp
|
| diff --git a/samplecode/SamplePicture.cpp b/samplecode/SamplePicture.cpp
|
| index 46c57d7f398133167b839b629f50a822f758be21..c78571a89bbd0e29bbbf7b996831730d29ff177a 100644
|
| --- a/samplecode/SamplePicture.cpp
|
| +++ b/samplecode/SamplePicture.cpp
|
| @@ -13,7 +13,7 @@
|
| #include "SkColorFilter.h"
|
| #include "SkColorPriv.h"
|
| #include "SkData.h"
|
| -#include "SkDecodingImageGenerator.h"
|
| +#include "SkImageGenerator.h"
|
| #include "SkDumpCanvas.h"
|
| #include "SkGradientShader.h"
|
| #include "SkGraphics.h"
|
| @@ -40,8 +40,7 @@ static SkBitmap load_bitmap() {
|
| SkString pngFilename = GetResourcePath("mandrill_512.png");
|
| SkAutoDataUnref data(SkData::NewFromFileName(pngFilename.c_str()));
|
| if (data.get() != NULL) {
|
| - SkInstallDiscardablePixelRef(SkDecodingImageGenerator::Create(
|
| - data, SkDecodingImageGenerator::Options()), &bm);
|
| + SkInstallDiscardablePixelRef(data, &bm);
|
| }
|
| return bm;
|
| }
|
|
|