From 04be2b54ba07a076d59bea7dcbd063641010d77d Mon Sep 17 00:00:00 2001 From: Leon Scroggins III Date: Thu, 17 Aug 2017 15:13:20 -0400 Subject: Reland "skia: add heif decoding support" This reverts commit db68a426b6ba3a0fa1cace25ac306037eb7413a6. Fixes errors in Android and Google3 Bug: b/64077740 Change-Id: I3d2bb1223e4d8ba912ea2b88144aeecc487fce1a Reviewed-on: https://skia-review.googlesource.com/35701 Commit-Queue: Leon Scroggins Reviewed-by: Chong Zhang Reviewed-by: Mike Klein Reviewed-by: Derek Sollenberger --- tests/CodecTest.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/CodecTest.cpp') diff --git a/tests/CodecTest.cpp b/tests/CodecTest.cpp index 6ffc44874c..baa231497f 100644 --- a/tests/CodecTest.cpp +++ b/tests/CodecTest.cpp @@ -919,8 +919,8 @@ DEF_TEST(Codec_wbmp_restrictive, r) { // wbmp images have a header that can be arbitrarily large, depending on the // size of the image. We cap the size at 65535, meaning we only need to look at // 8 bytes to determine whether we can read the image. This is important -// because SkCodec only passes 14 bytes to SkWbmpCodec to determine whether the -// image is a wbmp. +// because SkCodec only passes a limited number of bytes to SkWbmpCodec to +// determine whether the image is a wbmp. DEF_TEST(Codec_wbmp_max_size, r) { const unsigned char maxSizeWbmp[] = { 0x00, 0x00, // Header 0x83, 0xFF, 0x7F, // W: 65535 @@ -1279,7 +1279,7 @@ DEF_TEST(Codec_fallBack, r) { "randPixels.bmp", }; for (auto file : files) { - auto stream = LimitedRewindingStream::Make(file, 14); + auto stream = LimitedRewindingStream::Make(file, SkCodec::MinBufferedBytesNeeded()); if (!stream) { SkDebugf("Missing resources (%s). Set --resourcePath.\n", file); return; -- cgit v1.2.3