From ede7bac43fbc69b9fdf1c178890ba6353f5bb140 Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Sun, 23 Jul 2017 15:30:02 -0400 Subject: use unique_ptr for codec factories Will need guards for android (at least) Bug: skia: Change-Id: I2bb8e656997984489ef1f2e41cd3d301c4e7b947 Reviewed-on: https://skia-review.googlesource.com/26040 Reviewed-by: Mike Klein Commit-Queue: Mike Reed --- tests/GifTest.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tests/GifTest.cpp') diff --git a/tests/GifTest.cpp b/tests/GifTest.cpp index 5749df1be5..daa5cf56d0 100644 --- a/tests/GifTest.cpp +++ b/tests/GifTest.cpp @@ -195,7 +195,7 @@ DEF_TEST(Gif, reporter) { // Likewise, incremental decoding should succeed here. { sk_sp data = SkData::MakeWithoutCopy(gGIFDataNoColormap, 31); - std::unique_ptr codec(SkCodec::NewFromData(data)); + std::unique_ptr codec(SkCodec::MakeFromData(data)); REPORTER_ASSERT(reporter, codec); if (codec) { auto info = codec->getInfo().makeColorType(kN32_SkColorType); @@ -232,7 +232,7 @@ DEF_TEST(Gif_Sampled, r) { return; } - std::unique_ptr codec(SkAndroidCodec::NewFromStream(stream.release())); + std::unique_ptr codec(SkAndroidCodec::MakeFromStream(std::move(stream))); REPORTER_ASSERT(r, codec); if (!codec) { return; @@ -258,7 +258,7 @@ DEF_TEST(Codec_GifTruncated, r) { // This is right before the header for the first image. data = SkData::MakeSubset(data.get(), 0, 446); - std::unique_ptr codec(SkCodec::NewFromData(data)); + std::unique_ptr codec(SkCodec::MakeFromData(data)); REPORTER_ASSERT(r, !codec); } @@ -270,7 +270,7 @@ DEF_TEST(Codec_GifTruncated2, r) { // This is after the header, but before the color table. data = SkData::MakeSubset(data.get(), 0, 23); - std::unique_ptr codec(SkCodec::NewFromData(data)); + std::unique_ptr codec(SkCodec::MakeFromData(data)); if (!codec) { ERRORF(r, "Failed to create codec with partial data"); return; -- cgit v1.2.3