diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index 336744b3..b252fda7 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -2699,12 +2699,12 @@ struct wuffs_deflate__decoder__struct { uint32_t f_bits; uint32_t f_n_bits; + uint32_t f_history_index; + bool f_end_of_block; uint32_t f_huffs[2][1024]; uint32_t f_n_huffs_bits[2]; uint8_t f_history[32768]; - uint32_t f_history_index; uint8_t f_code_lengths[320]; - bool f_end_of_block; struct { uint32_t coro_susp_point; @@ -3107,11 +3107,11 @@ struct wuffs_gif__decoder__struct { wuffs_base__range_ie_u32 f_dirty_y; uint64_t f_compressed_ri; uint64_t f_compressed_wi; + wuffs_base__pixel_swizzler f_swizzler; + wuffs_lzw__decoder f_lzw; uint8_t f_compressed[4096]; uint8_t f_palettes[2][1024]; uint8_t f_dst_palette[1024]; - wuffs_base__pixel_swizzler f_swizzler; - wuffs_lzw__decoder f_lzw; struct { uint32_t coro_susp_point; @@ -3350,9 +3350,9 @@ struct wuffs_gzip__decoder__struct { uint32_t magic; uint32_t active_coroutine; - wuffs_deflate__decoder f_flate; - wuffs_crc32__ieee_hasher f_checksum; bool f_ignore_checksum; + wuffs_crc32__ieee_hasher f_checksum; + wuffs_deflate__decoder f_flate; struct { uint32_t coro_susp_point; @@ -3502,9 +3502,9 @@ struct wuffs_zlib__decoder__struct { uint32_t magic; uint32_t active_coroutine; - wuffs_deflate__decoder f_flate; - wuffs_adler32__hasher f_checksum; bool f_ignore_checksum; + wuffs_adler32__hasher f_checksum; + wuffs_deflate__decoder f_flate; struct { uint32_t coro_susp_point; @@ -10488,16 +10488,16 @@ wuffs_gzip__decoder__check_wuffs_version(wuffs_gzip__decoder* self, return wuffs_base__error__check_wuffs_version_not_applicable; } { - wuffs_base__status z = wuffs_deflate__decoder__check_wuffs_version( - &self->private_impl.f_flate, sizeof(self->private_impl.f_flate), + wuffs_base__status z = wuffs_crc32__ieee_hasher__check_wuffs_version( + &self->private_impl.f_checksum, sizeof(self->private_impl.f_checksum), WUFFS_VERSION); if (z) { return z; } } { - wuffs_base__status z = wuffs_crc32__ieee_hasher__check_wuffs_version( - &self->private_impl.f_checksum, sizeof(self->private_impl.f_checksum), + wuffs_base__status z = wuffs_deflate__decoder__check_wuffs_version( + &self->private_impl.f_flate, sizeof(self->private_impl.f_flate), WUFFS_VERSION); if (z) { return z; @@ -10951,16 +10951,16 @@ wuffs_zlib__decoder__check_wuffs_version(wuffs_zlib__decoder* self, return wuffs_base__error__check_wuffs_version_not_applicable; } { - wuffs_base__status z = wuffs_deflate__decoder__check_wuffs_version( - &self->private_impl.f_flate, sizeof(self->private_impl.f_flate), + wuffs_base__status z = wuffs_adler32__hasher__check_wuffs_version( + &self->private_impl.f_checksum, sizeof(self->private_impl.f_checksum), WUFFS_VERSION); if (z) { return z; } } { - wuffs_base__status z = wuffs_adler32__hasher__check_wuffs_version( - &self->private_impl.f_checksum, sizeof(self->private_impl.f_checksum), + wuffs_base__status z = wuffs_deflate__decoder__check_wuffs_version( + &self->private_impl.f_flate, sizeof(self->private_impl.f_flate), WUFFS_VERSION); if (z) { return z; diff --git a/std/deflate/decode_deflate.wuffs b/std/deflate/decode_deflate.wuffs index 06a857e4..389561bc 100644 --- a/std/deflate/decode_deflate.wuffs +++ b/std/deflate/decode_deflate.wuffs @@ -64,6 +64,14 @@ pub struct decoder?( bits base.u32, n_bits base.u32, + // history_index indexes the history array, defined below. + history_index base.u32, + + // end_of_block is whether decode_huffman_xxx saw an end-of-block code. + // + // TODO: can decode_huffman_xxx signal this in band instead of out of band? + end_of_block base.bool, + // huffs and n_huffs_bits are the lookup tables for Huffman decodings. // // There are up to 2 Huffman decoders active at any one time. As per this @@ -108,8 +116,7 @@ pub struct decoder?( // // history[history_index & 0x7FFF] is where the next byte of decoded output // will be written. - history array[0x8000] base.u8, // 32 KiB. - history_index base.u32, + history array[0x8000] base.u8, // 32 KiB. // code_lengths is used to pass out-of-band data to init_huff. // @@ -117,11 +124,6 @@ pub struct decoder?( // code. code_lengths array[320] base.u8[..15], - // end_of_block is whether decode_huffman_xxx saw an end-of-block code. - // - // TODO: can decode_huffman_xxx signal this in band instead of out of band? - end_of_block base.bool, - util base.utility, ) diff --git a/std/gif/decode_gif.wuffs b/std/gif/decode_gif.wuffs index 4d4c3056..469e37fb 100644 --- a/std/gif/decode_gif.wuffs +++ b/std/gif/decode_gif.wuffs @@ -110,18 +110,20 @@ pub struct decoder?( dst_y base.u32, dirty_y base.range_ie_u32, + // Indexes into the compressed array, defined below. compressed_ri base.u64, compressed_wi base.u64, - compressed array[4096] base.u8, + + swizzler base.pixel_swizzler, + util base.utility, + lzw lzw.decoder, + + compressed array[4096] base.u8, // palettes[0] and palettes[1] are the Global and Local Color Table. palettes array[2] array[4 * 256] base.u8, // dst_palette is the swizzled color table. dst_palette array[4 * 256] base.u8, - - swizzler base.pixel_swizzler, - util base.utility, - lzw lzw.decoder, ) pub func decoder.decode_image_config?(dst nptr base.image_config, src base.io_reader) { diff --git a/std/gzip/decode_gzip.wuffs b/std/gzip/decode_gzip.wuffs index 9bad0a45..89b7ed1c 100644 --- a/std/gzip/decode_gzip.wuffs +++ b/std/gzip/decode_gzip.wuffs @@ -24,10 +24,12 @@ pub status "?bad header" pub const decoder_workbuf_len_max_incl_worst_case base.u64 = 32768 + 512 pub struct decoder?( - flate deflate.decoder, - checksum crc32.ieee_hasher, ignore_checksum base.bool, - util base.utility, + checksum crc32.ieee_hasher, + + flate deflate.decoder, + + util base.utility, ) pub func decoder.set_ignore_checksum!(ic base.bool) { diff --git a/std/zlib/decode_zlib.wuffs b/std/zlib/decode_zlib.wuffs index ad2e345a..c7719b79 100644 --- a/std/zlib/decode_zlib.wuffs +++ b/std/zlib/decode_zlib.wuffs @@ -26,10 +26,12 @@ pri status "?TODO: unsupported preset dictionary" pub const decoder_workbuf_len_max_incl_worst_case base.u64 = 32768 + 512 pub struct decoder?( - flate deflate.decoder, - checksum adler32.hasher, ignore_checksum base.bool, - util base.utility, + checksum adler32.hasher, + + flate deflate.decoder, + + util base.utility, ) pub func decoder.set_ignore_checksum!(ic base.bool) {