From 65afe919b5a40cf16e4a6560772d2296f8c41968 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Thu, 2 Jun 2022 16:44:37 +1000 Subject: [PATCH] Fix std/gif "@end of data" for 0-frame GIFs This fixes a regression introduced by 8d03a67e "Re-do image decoders' call sequence state machine". build-all.sh's script/print-nia-checksums.sh test once again matches test/nia-checksums-of-data.txt: -4c6d02c3 test/data/artificial-gif/no-frames.gif +ba6e48f8 test/data/artificial-gif/no-frames.gif --- release/c/wuffs-unsupported-snapshot.c | 4 +++- std/gif/decode_gif.wuffs | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index 2f0b4ee7..eafff16a 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -31424,7 +31424,9 @@ wuffs_gif__decoder__decode_image_config( self->private_impl.f_frame_config_io_position, v_ffio); } - self->private_impl.f_call_sequence = 32; + if (self->private_impl.f_call_sequence == 0) { + self->private_impl.f_call_sequence = 32; + } goto ok; ok: diff --git a/std/gif/decode_gif.wuffs b/std/gif/decode_gif.wuffs index 34bc6735..f48efe19 100644 --- a/std/gif/decode_gif.wuffs +++ b/std/gif/decode_gif.wuffs @@ -137,7 +137,9 @@ pub func decoder.decode_image_config?(dst: nptr base.image_config, src: base.io_ first_frame_is_opaque: ffio) } - this.call_sequence = 0x20 + if this.call_sequence == 0x00 { + this.call_sequence = 0x20 + } } pub func decoder.set_report_metadata!(fourcc: base.u32, report: base.bool) {