From 7397d7ade8b72f3b75e9384693aa59292a63fd68 Mon Sep 17 00:00:00 2001 From: Leon Scroggins III Date: Thu, 4 Jan 2018 13:26:30 -0500 Subject: Add SkAndroidCodec::MakeFromCodec Bug: b/71578461 Bug: b/63909536 This allows using APIs on SkCodec (e.g. the out-param result on SkCodec::MakeFrom(Stream/Data), getOrigin) when an SkAndroidCodec is ultimately desired without duplicating the APIs on SkAndroidCodec. Change-Id: Ie9803278348acfb3955a795772d6472c15541646 Reviewed-on: https://skia-review.googlesource.com/90844 Reviewed-by: Derek Sollenberger Commit-Queue: Leon Scroggins --- tests/CodecTest.cpp | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'tests/CodecTest.cpp') diff --git a/tests/CodecTest.cpp b/tests/CodecTest.cpp index 7eddbb785e..df94547600 100644 --- a/tests/CodecTest.cpp +++ b/tests/CodecTest.cpp @@ -406,14 +406,7 @@ static void check(skiatest::Reporter* r, return; } - std::unique_ptr androidCodec(nullptr); - if (isIncomplete) { - size_t size = stream->getLength(); - sk_sp data((SkData::MakeFromStream(stream.get(), 2 * size / 3))); - androidCodec = SkAndroidCodec::MakeFromData(data); - } else { - androidCodec = SkAndroidCodec::MakeFromStream(std::move(stream)); - } + auto androidCodec = SkAndroidCodec::MakeFromCodec(std::move(codec)); if (!androidCodec) { ERRORF(r, "Unable to decode '%s'", path); return; -- cgit v1.2.3