diff options
author | reed <reed@google.com> | 2014-09-12 12:12:27 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-09-12 12:12:27 -0700 |
commit | 9594da111dc1c36c1912eb61207aaa54c17ea550 (patch) | |
tree | e923b1b116d1a41d50c949260c57a25f061eebeb /tools/lua | |
parent | 9db328b64f8f2eb901499664d92ac7fd236c3cde (diff) |
use SkData::NewUninitialized
BUG=skia:
R=bungeman@google.com
Author: reed@google.com
Review URL: https://codereview.chromium.org/565803005
Diffstat (limited to 'tools/lua')
-rw-r--r-- | tools/lua/lua_app.cpp | 11 | ||||
-rw-r--r-- | tools/lua/lua_pictures.cpp | 16 |
2 files changed, 8 insertions, 19 deletions
diff --git a/tools/lua/lua_app.cpp b/tools/lua/lua_app.cpp index 50b1352c2d..023ddaeaca 100644 --- a/tools/lua/lua_app.cpp +++ b/tools/lua/lua_app.cpp @@ -18,14 +18,11 @@ extern "C" { } static SkData* read_into_data(const char file[]) { - SkAutoTUnref<SkStream> stream(SkStream::NewFromFile(file)); - if (!stream.get()) { - return SkData::NewEmpty(); + SkData* data = SkData::NewFromFileName(file); + if (!data) { + data = SkData::NewEmpty(); } - size_t len = stream->getLength(); - void* buffer = sk_malloc_throw(len); - stream->read(buffer, len); - return SkData::NewFromMalloc(buffer, len); + return data; } int tool_main(int argc, char** argv); diff --git a/tools/lua/lua_pictures.cpp b/tools/lua/lua_pictures.cpp index 635cf0bed0..6c7087fc05 100644 --- a/tools/lua/lua_pictures.cpp +++ b/tools/lua/lua_pictures.cpp @@ -47,17 +47,6 @@ static SkPicture* load_picture(const char path[]) { return pic; } -static SkData* read_into_data(const char file[]) { - SkAutoTUnref<SkStream> stream(SkStream::NewFromFile(file)); - if (!stream.get()) { - return SkData::NewEmpty(); - } - size_t len = stream->getLength(); - void* buffer = sk_malloc_throw(len); - stream->read(buffer, len); - return SkData::NewFromMalloc(buffer, len); -} - static void call_canvas(lua_State* L, SkLuaCanvas* canvas, const char pictureFile[], const char funcName[]) { lua_getglobal(L, funcName); @@ -97,7 +86,10 @@ int tool_main(int argc, char** argv) { SkLua L(summary); for (int i = 0; i < FLAGS_luaFile.count(); ++i) { - SkAutoDataUnref data(read_into_data(FLAGS_luaFile[i])); + SkAutoDataUnref data(SkData::NewFromFileName(FLAGS_luaFile[i])); + if (NULL == data.get()) { + data.reset(SkData::NewEmpty()); + } if (!FLAGS_quiet) { SkDebugf("loading %s...\n", FLAGS_luaFile[i]); } |