diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index 251be3bd..dbf5a7b9 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -8140,12 +8140,12 @@ wuffs_lzw__decoder__set_literal_width(wuffs_lzw__decoder* self, uint32_t a_lw) { if (self->private_impl.magic != WUFFS_BASE__MAGIC) { return wuffs_base__make_empty_struct(); } - if (a_lw < 1 || a_lw > 8) { + if (a_lw > 8) { self->private_impl.magic = WUFFS_BASE__DISABLED; return wuffs_base__make_empty_struct(); } - self->private_impl.f_set_literal_width_arg = a_lw; + self->private_impl.f_set_literal_width_arg = (a_lw + 1); return wuffs_base__make_empty_struct(); } @@ -8198,7 +8198,7 @@ wuffs_lzw__decoder__decode_io_writer(wuffs_lzw__decoder* self, self->private_impl.f_literal_width = 8; if (self->private_impl.f_set_literal_width_arg > 0) { self->private_impl.f_literal_width = - self->private_impl.f_set_literal_width_arg; + (self->private_impl.f_set_literal_width_arg - 1); } self->private_impl.f_clear_code = (((uint32_t)(1)) << self->private_impl.f_literal_width); @@ -9307,7 +9307,7 @@ wuffs_gif__decoder__skip_frame(wuffs_gif__decoder* self, uint8_t t_1 = *iop_a_src++; v_lw = t_1; } - if ((v_lw < 1) || (8 < v_lw)) { + if (v_lw > 8) { status = wuffs_gif__error__bad_literal_width; goto exit; } @@ -10800,7 +10800,7 @@ wuffs_gif__decoder__decode_id_part1(wuffs_gif__decoder* self, uint8_t t_2 = *iop_a_src++; v_lw = t_2; } - if ((v_lw < 1) || (8 < v_lw)) { + if (v_lw > 8) { status = wuffs_gif__error__bad_literal_width; goto exit; } diff --git a/std/gif/decode_gif.wuffs b/std/gif/decode_gif.wuffs index 920d7149..e999ff23 100644 --- a/std/gif/decode_gif.wuffs +++ b/std/gif/decode_gif.wuffs @@ -451,7 +451,7 @@ pri func decoder.skip_frame?(src base.io_reader) { // Process the LZW literal width. lw = args.src.read_u8?() - if (lw < 1) or (8 < lw) { + if lw > 8 { return "#bad literal width" } @@ -942,9 +942,9 @@ pri func decoder.decode_id_part1?(dst ptr base.pixel_buffer, src base.io_reader) // Process the LZW literal width. The spec says that "images which have one // color bit must be indicated as having a code size [i.e. literal width] - // of 2", but in practice, some encoders use a literal width of 1. + // of 2", but in practice, some encoders use a literal width of 1 or 0. lw = args.src.read_u8?() - if (lw < 1) or (8 < lw) { + if lw > 8 { return "#bad literal width" } this.lzw.set_literal_width!(lw:lw as base.u32) diff --git a/std/lzw/decode_lzw.wuffs b/std/lzw/decode_lzw.wuffs index 2a984aeb..5f02e991 100644 --- a/std/lzw/decode_lzw.wuffs +++ b/std/lzw/decode_lzw.wuffs @@ -27,11 +27,11 @@ pri status "#internal error: inconsistent I/O" pub const decoder_workbuf_len_max_incl_worst_case base.u64 = 0 pub struct decoder?( - // set_literal_width_arg is the saved argument passed to set_literal_width. - // This field is copied to the literal_width field at the start of - // decode_io_writer. During that method, calling set_literal_width will - // change set_literal_width_arg but not literal_width. - set_literal_width_arg base.u32[..8], + // set_literal_width_arg is 1 plus the saved argument passed to + // set_literal_width. This is assigned to the literal_width field at the + // start of decode_io_writer. During that method, calling set_literal_width + // will change set_literal_width_arg but not literal_width. + set_literal_width_arg base.u32[..9], // read_from state that does not change during a decode call. literal_width base.u32[..8], @@ -69,8 +69,8 @@ pub struct decoder?( output array[8192 + 7] base.u8, ) -pub func decoder.set_literal_width!(lw base.u32[1..8]) { - this.set_literal_width_arg = args.lw +pub func decoder.set_literal_width!(lw base.u32[..8]) { + this.set_literal_width_arg = args.lw + 1 } pub func decoder.workbuf_len() base.range_ii_u64 { @@ -83,7 +83,7 @@ pub func decoder.decode_io_writer?(dst base.io_writer, src base.io_reader, workb // Initialize read_from state. this.literal_width = 8 if this.set_literal_width_arg > 0 { - this.literal_width = this.set_literal_width_arg + this.literal_width = this.set_literal_width_arg - 1 } this.clear_code = (1 as base.u32) << this.literal_width this.end_code = this.clear_code + 1