diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index 0c526256..350ab54a 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -41415,20 +41415,26 @@ wuffs_jpeg__decoder__fill_bitstream( self->private_impl.f_bitstream_wi = v_wi; } v_wi = self->private_impl.f_bitstream_wi; + label__0__continue:; while ((v_wi < 2048u) && (((uint64_t)(io2_a_src - iop_a_src)) > 0u)) { v_c = wuffs_base__peek_u8be__no_bounds_check(iop_a_src); + self->private_data.f_bitstream_buffer[v_wi] = v_c; + v_wi += 1u; + iop_a_src += 1u; if (v_c < 255u) { - self->private_data.f_bitstream_buffer[v_wi] = v_c; - v_wi += 1u; - iop_a_src += 1u; - } else if (((uint64_t)(io2_a_src - iop_a_src)) <= 1u) { + goto label__0__continue; + } else if (((uint64_t)(io2_a_src - iop_a_src)) <= 0u) { + if (iop_a_src > io1_a_src) { + iop_a_src--; + } goto label__0__break; - } else if ((wuffs_base__peek_u16le__no_bounds_check(iop_a_src) >> 8u) > 0u) { + } else if (wuffs_base__peek_u8be__no_bounds_check(iop_a_src) > 0u) { + if (iop_a_src > io1_a_src) { + iop_a_src--; + } goto label__0__break; } else { - self->private_data.f_bitstream_buffer[v_wi] = 255u; - v_wi += 1u; - iop_a_src += 2u; + iop_a_src += 1u; } } label__0__break:; diff --git a/std/jpeg/decode_jpeg.wuffs b/std/jpeg/decode_jpeg.wuffs index b8f99ccf..fdf7f4c3 100644 --- a/std/jpeg/decode_jpeg.wuffs +++ b/std/jpeg/decode_jpeg.wuffs @@ -1495,21 +1495,27 @@ pri func decoder.fill_bitstream!(src: base.io_reader) { wi = this.bitstream_wi while (wi < 0x800) and (args.src.length() > 0) { c = args.src.peek_u8() - if c < 0xFF { - this.bitstream_buffer[wi] = c - wi += 1 - args.src.skip_u32_fast!(actual: 1, worst_case: 1) + this.bitstream_buffer[wi] = c + wi += 1 + args.src.skip_u32_fast!(actual: 1, worst_case: 1) - } else if args.src.length() <= 1 { + if c < 0xFF { + continue + + } else if args.src.length() <= 0 { + if args.src.can_undo_byte() { + args.src.undo_byte!() + } break - } else if (args.src.peek_u16le() >> 8) > 0 { + } else if args.src.peek_u8() > 0 { + if args.src.can_undo_byte() { + args.src.undo_byte!() + } break } else { - this.bitstream_buffer[wi] = 0xFF - wi += 1 - args.src.skip_u32_fast!(actual: 2, worst_case: 2) + args.src.skip_u32_fast!(actual: 1, worst_case: 1) } } endwhile