From 5d1473a2ca7cb03402b9953b819cb69285eed729 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Fri, 26 Nov 2021 19:45:42 +1100 Subject: [PATCH] Refactor std/png decoder.tell_me_more --- release/c/wuffs-unsupported-snapshot.c | 40 ++++++++++++++------------ std/png/decode_png.wuffs | 28 +++++++++--------- 2 files changed, 36 insertions(+), 32 deletions(-) diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index 6e5a08a6..f2a4cb35 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -41032,26 +41032,28 @@ wuffs_png__decoder__tell_me_more( } self->private_impl.f_metadata_is_zlib_compressed = true; } - } else { - if (self->private_impl.f_chunk_length != 0) { - status = wuffs_base__make_status(wuffs_png__error__bad_chunk); - goto exit; - } - self->private_data.s_tell_me_more[0].scratch = 4; - WUFFS_BASE__COROUTINE_SUSPENSION_POINT(16); - if (self->private_data.s_tell_me_more[0].scratch > ((uint64_t)(io2_a_src - iop_a_src))) { - self->private_data.s_tell_me_more[0].scratch -= ((uint64_t)(io2_a_src - iop_a_src)); - iop_a_src = io2_a_src; - status = wuffs_base__make_status(wuffs_base__suspension__short_read); - goto suspend; - } - iop_a_src += self->private_data.s_tell_me_more[0].scratch; - self->private_impl.f_metadata_flavor = 0; - self->private_impl.f_metadata_fourcc = 0; - self->private_impl.f_metadata_x = 0; - self->private_impl.f_metadata_y = 0; - self->private_impl.f_metadata_z = 0; + self->private_impl.f_call_sequence = 2; + status = wuffs_base__make_status(NULL); + goto ok; } + if (self->private_impl.f_chunk_length != 0) { + status = wuffs_base__make_status(wuffs_png__error__bad_chunk); + goto exit; + } + self->private_data.s_tell_me_more[0].scratch = 4; + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(16); + if (self->private_data.s_tell_me_more[0].scratch > ((uint64_t)(io2_a_src - iop_a_src))) { + self->private_data.s_tell_me_more[0].scratch -= ((uint64_t)(io2_a_src - iop_a_src)); + iop_a_src = io2_a_src; + status = wuffs_base__make_status(wuffs_base__suspension__short_read); + goto suspend; + } + iop_a_src += self->private_data.s_tell_me_more[0].scratch; + self->private_impl.f_metadata_flavor = 0; + self->private_impl.f_metadata_fourcc = 0; + self->private_impl.f_metadata_x = 0; + self->private_impl.f_metadata_y = 0; + self->private_impl.f_metadata_z = 0; self->private_impl.f_call_sequence = 2; status = wuffs_base__make_status(NULL); goto ok; diff --git a/std/png/decode_png.wuffs b/std/png/decode_png.wuffs index 225ea903..580bd81a 100644 --- a/std/png/decode_png.wuffs +++ b/std/png/decode_png.wuffs @@ -1651,21 +1651,23 @@ pub func decoder.tell_me_more?(dst: base.io_writer, minfo: nptr base.more_inform this.metadata_is_zlib_compressed = true } - } else { - if this.chunk_length <> 0 { - return "#bad chunk" - } - - // Skip the ancillary chunk's CRC-32 checksum. - args.src.skip?(n: 4) - - this.metadata_flavor = 0 - this.metadata_fourcc = 0 - this.metadata_x = 0 - this.metadata_y = 0 - this.metadata_z = 0 + this.call_sequence = 2 + return ok } + if this.chunk_length <> 0 { + return "#bad chunk" + } + + // Skip the ancillary chunk's CRC-32 checksum. + args.src.skip?(n: 4) + + this.metadata_flavor = 0 + this.metadata_fourcc = 0 + this.metadata_x = 0 + this.metadata_y = 0 + this.metadata_z = 0 + this.call_sequence = 2 return ok }