diff options
| author |  reed <reed@google.com> | 2015-01-07 18:04:45 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-01-07 18:04:45 -0800 |
| commit | 5965c8ae4ee960275da4bc40189bdba85aab8b5e (patch) | |
| tree | dc7f14af5cbce088311191a981b6ae67c2286be6 /tools | |
| parent | 23d432080cb8506bf8e371b1637ce8f2de9c0c05 (diff) | |
add ImageGenerator::NewFromData to porting layer
BUG=skia:3275
Review URL: https://codereview.chromium.org/834633006
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/LazyDecodeBitmap.cpp | 5 | ||||
| -rw-r--r-- | tools/Resources.cpp | 6 |
2 files changed, 3 insertions, 8 deletions
diff --git a/tools/LazyDecodeBitmap.cpp b/tools/LazyDecodeBitmap.cpp index ec275eacab..0dca16b3f1 100644 --- a/tools/LazyDecodeBitmap.cpp +++ b/tools/LazyDecodeBitmap.cpp @@ -8,7 +8,6 @@ #include "LazyDecodeBitmap.h" #include "SkData.h" -#include "SkDecodingImageGenerator.h" #include "SkDiscardableMemoryPool.h" #include "SkImageGeneratorPriv.h" #include "SkForceLinking.h" @@ -31,9 +30,7 @@ bool sk_tools::LazyDecodeBitmap(const void* src, return false; } - SkAutoTDelete<SkImageGenerator> gen( - SkDecodingImageGenerator::Create( - data, SkDecodingImageGenerator::Options())); + SkAutoTDelete<SkImageGenerator> gen(SkImageGenerator::NewFromData(data)); SkImageInfo info; if ((NULL == gen.get()) || !gen->getInfo(&info)) { return false; diff --git a/tools/Resources.cpp b/tools/Resources.cpp index 50c08922fa..43cc21d209 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); } |