diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index 303e1325..4e06844b 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -43821,7 +43821,9 @@ wuffs_jpeg__decoder__apply_progressive_idct( uint32_t v_mx = 0; uint64_t v_stride = 0; uint64_t v_offset = 0; + uint8_t v_stashed_mcu_blocks_0[128] = {0}; + wuffs_base__bulk_save_host_endian(&self->private_data.f_mcu_blocks[0], 1u * (size_t)128u, wuffs_base__make_slice_u8(v_stashed_mcu_blocks_0, 128)); v_block_smoothing_applicable = true; v_csel = 0u; while (v_csel < self->private_impl.f_num_components) { @@ -43873,6 +43875,7 @@ wuffs_jpeg__decoder__apply_progressive_idct( } v_csel += 1u; } + wuffs_base__bulk_load_host_endian(&self->private_data.f_mcu_blocks[0], 1u * (size_t)128u, wuffs_base__make_slice_u8(v_stashed_mcu_blocks_0, 128)); return wuffs_base__make_empty_struct(); } diff --git a/std/jpeg/decode_jpeg.wuffs b/std/jpeg/decode_jpeg.wuffs index 7d5323dc..5534b2f7 100644 --- a/std/jpeg/decode_jpeg.wuffs +++ b/std/jpeg/decode_jpeg.wuffs @@ -1825,6 +1825,12 @@ pri func decoder.apply_progressive_idct!(workbuf: slice base.u8) { var stride : base.u64[..= 0x1_0008] var offset : base.u64 + // Copies mcu_blocks[0], which load_mcu_blocks_for_single_component might + // overwrite, as decode_mcu may be suspended (due to a "$short read"). + var stashed_mcu_blocks_0 : array[128] base.u8 + + this.mcu_blocks[.. 1].bulk_save_host_endian!(dst: stashed_mcu_blocks_0[..]) + block_smoothing_applicable = true csel = 0 while csel < this.num_components { @@ -1900,6 +1906,8 @@ pri func decoder.apply_progressive_idct!(workbuf: slice base.u8) { csel += 1 } endwhile + + this.mcu_blocks[.. 1].bulk_load_host_endian!(src: stashed_mcu_blocks_0[..]) } pri func decoder.swizzle_gray!(dst: ptr base.pixel_buffer, workbuf: slice base.u8) base.status { diff --git a/test/3pdata/nia-checksums-of-blinksuite.txt b/test/3pdata/nia-checksums-of-blinksuite.txt index 15265d8b..69a44e92 100644 --- a/test/3pdata/nia-checksums-of-blinksuite.txt +++ b/test/3pdata/nia-checksums-of-blinksuite.txt @@ -66,7 +66,7 @@ d97ce4e8 test/3pdata/blinksuite/cs-uma-ycbcr-other.jpg a2a940bc test/3pdata/blinksuite/cs-uma-ycck.jpg b6000be6 test/3pdata/blinksuite/dice.png 1023c20a test/3pdata/blinksuite/empty-frame.png -32a03152 test/3pdata/blinksuite/flowchart.jpg +eff36075 test/3pdata/blinksuite/flowchart.jpg 20ff1df8 test/3pdata/blinksuite/full2loop.gif dc814e29 test/3pdata/blinksuite/gif-loop-count.gif 7306cefe test/3pdata/blinksuite/gif-loop-count.png @@ -91,7 +91,7 @@ f37cea44 test/3pdata/blinksuite/icc-v2-gbr-422-whole-mcus.jpg 1de5a906 test/3pdata/blinksuite/icc-v2-gbr.jpg 0da5f37e test/3pdata/blinksuite/jpeg-height-exif-orientation.jpg 4409dca6 test/3pdata/blinksuite/large-gif-checkerboard.gif -9a1b1c39 test/3pdata/blinksuite/missing-eoi.jpg +2f310e57 test/3pdata/blinksuite/missing-eoi.jpg 72bbe2b6 test/3pdata/blinksuite/motion-jpeg-single-frame.jpg 0268284a test/3pdata/blinksuite/mu.png 263cb2b3 test/3pdata/blinksuite/non-interleaved_progressive-1.jpg