diff options
| author |  reed <reed@google.com> | 2016-03-18 07:25:55 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-18 07:25:55 -0700 |
| commit | ca2622ba051829fed5f30facd74c5b41cd4b931c (patch) | |
| tree | 3d8248b7764e500f857b3d6cfb6866e72b632199 /tools/lua | |
| parent | eb75c7db3a7372de68347d0df8d58acebc33a9ad (diff) | |
return pictures as sk_sp
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1811703002
Review URL: https://codereview.chromium.org/1811703002
Diffstat (limited to 'tools/lua')
| -rw-r--r-- | tools/lua/lua_pictures.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/tools/lua/lua_pictures.cpp b/tools/lua/lua_pictures.cpp index c526406f1c..0edea2576e 100644 --- a/tools/lua/lua_pictures.cpp +++ b/tools/lua/lua_pictures.cpp @@ -38,13 +38,12 @@ DEFINE_string2(headCode, s, "", "Optional lua code to call at beginning"); DEFINE_string2(tailFunc, s, "", "Optional lua function to call at end"); DEFINE_bool2(quiet, q, false, "Silence all non-error related output"); -static SkPicture* load_picture(const char path[]) { +static sk_sp<SkPicture> load_picture(const char path[]) { SkAutoTDelete<SkStream> stream(SkStream::NewFromFile(path)); - SkPicture* pic = nullptr; if (stream.get()) { - pic = SkPicture::CreateFromStream(stream.get()); + return SkPicture::MakeFromStream(stream.get()); } - return pic; + return nullptr; } static void call_canvas(lua_State* L, SkLuaCanvas* canvas, @@ -143,7 +142,7 @@ int tool_main(int argc, char** argv) { SkDebugf("scraping %s %s\n", path, moduloStr.c_str()); } - SkAutoTUnref<SkPicture> pic(load_picture(path)); + auto pic(load_picture(path)); if (pic.get()) { SkAutoTUnref<SkLuaCanvas> canvas( new SkLuaCanvas(SkScalarCeilToInt(pic->cullRect().width()), |