| Index: tools/Resources.cpp
|
| diff --git a/tools/Resources.cpp b/tools/Resources.cpp
|
| index 50c08922fa1acc66f61960ce45eb8057ee84272e..43cc21d20991349871433e81c7347a73cf6acfd9 100644
|
| --- a/tools/Resources.cpp
|
| +++ b/tools/Resources.cpp
|
| @@ -9,7 +9,7 @@
|
| #include "SkBitmap.h"
|
| #include "SkCommandLineFlags.h"
|
| #include "SkData.h"
|
| -#include "SkDecodingImageGenerator.h"
|
| +#include "SkImageGenerator.h"
|
| #include "SkOSFile.h"
|
|
|
| DEFINE_string2(resourcePath, i, "resources", "Directory with test resources: images, fonts, etc.");
|
| @@ -26,7 +26,5 @@ bool GetResourceAsBitmap(const char* resource, SkBitmap* dst) {
|
| SkString resourcePath = GetResourcePath(resource);
|
| SkAutoTUnref<SkData> resourceData(
|
| SkData::NewFromFileName(resourcePath.c_str()));
|
| - return resourceData && SkInstallDiscardablePixelRef(
|
| - SkDecodingImageGenerator::Create(
|
| - resourceData, SkDecodingImageGenerator::Options()), dst);
|
| + return resourceData && SkInstallDiscardablePixelRef(resourceData, dst);
|
| }
|
|
|