diff options
| author |  Leon Scroggins III <scroggo@google.com> | 2018-01-04 13:26:30 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-01-04 21:36:04 +0000 |
| commit | 7397d7ade8b72f3b75e9384693aa59292a63fd68 (patch) | |
| tree | 58ae0cfad2dddaef2ff79250862ac3aba7a4ce2b /tests/CodecTest.cpp | |
| parent | ff889f13392c64b4688acce65cf6079e54981253 (diff) | |
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 <djsollen@google.com>
Commit-Queue: Leon Scroggins <scroggo@google.com>
Diffstat (limited to 'tests/CodecTest.cpp')
| -rw-r--r-- | tests/CodecTest.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
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<SkAndroidCodec> androidCodec(nullptr); - if (isIncomplete) { - size_t size = stream->getLength(); - sk_sp<SkData> 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; |