From f55274aaa70b01f747c409c55105d01ad7941b1c Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Tue, 24 May 2022 13:58:48 +1000 Subject: [PATCH] Fix -Werror=conversion in decode_bzip2.wuffs --- release/c/wuffs-unsupported-snapshot.c | 2 +- std/bzip2/decode_bzip2.wuffs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index 6631c088..2b5971e3 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -25910,7 +25910,7 @@ wuffs_bzip2__decoder__build_huffman_table( #pragma GCC diagnostic pop #endif } - self->private_data.f_huffman_tables[a_which][v_i] = (v_child | (v_n_bits << 12)); + self->private_data.f_huffman_tables[a_which][v_i] = ((uint16_t)((v_child | (v_n_bits << 12)))); v_i += 1; } return wuffs_base__make_empty_struct(); diff --git a/std/bzip2/decode_bzip2.wuffs b/std/bzip2/decode_bzip2.wuffs index ed3de897..fbe81b80 100644 --- a/std/bzip2/decode_bzip2.wuffs +++ b/std/bzip2/decode_bzip2.wuffs @@ -692,7 +692,7 @@ pri func decoder.build_huffman_table!(which: base.u32[..= 5]) { bits ~mod<<= 1 n_bits += 1 } endwhile - this.huffman_tables[args.which][i] = child | (n_bits << 12) + this.huffman_tables[args.which][i] = (child | (n_bits << 12)) as base.u16 i += 1 } endwhile }