aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/Resources.cpp
diff options
context:
space:
mode:
authorGravatar reed <reed@google.com>2015-01-07 18:04:45 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2015-01-07 18:04:45 -0800
commit5965c8ae4ee960275da4bc40189bdba85aab8b5e (patch)
treedc7f14af5cbce088311191a981b6ae67c2286be6 /tools/Resources.cpp
parent23d432080cb8506bf8e371b1637ce8f2de9c0c05 (diff)
add ImageGenerator::NewFromData to porting layer
Diffstat (limited to 'tools/Resources.cpp')
-rw-r--r--tools/Resources.cpp6
1 files changed, 2 insertions, 4 deletions
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);
}