diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index c1df0380..5b435ceb 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -41733,6 +41733,7 @@ wuffs_jpeg__decoder__decode_mcu__choosy_default( label__1__break:; } v_ac_rrrr = (v_ac_symbol >> 4u); + v_z += (v_ac_rrrr + 1u); v_ac_ssss = (v_ac_symbol & 15u); v_ac_extend = WUFFS_JPEG__EXTEND[v_ac_ssss]; if (v_ac_ssss > 0u) { @@ -41740,12 +41741,9 @@ wuffs_jpeg__decoder__decode_mcu__choosy_default( v_ac_value += (v_ac_extend & (((uint16_t)(wuffs_base__utility__sign_extend_rshift_u64(v_bits, 63u))) ^ 65535u)); v_bits <<= v_ac_ssss; v_n_bits -= v_ac_ssss; - v_z += (v_ac_rrrr + 1u); self->private_data.f_mcu_blocks[0u][WUFFS_JPEG__UNZIG[v_z]] = v_ac_value; } else if (v_ac_rrrr < 15u) { goto label__ac_components__break; - } else { - v_z += 16u; } } label__ac_components__break:; @@ -41893,6 +41891,7 @@ wuffs_jpeg__decoder__decode_mcu_progressive_ac_high_bits( label__0__break:; } v_ac_rrrr = (v_ac_symbol >> 4u); + v_z += (v_ac_rrrr + 1u); v_ac_ssss = (v_ac_symbol & 15u); v_ac_extend = WUFFS_JPEG__EXTEND[v_ac_ssss]; if (v_ac_ssss > 0u) { @@ -41900,7 +41899,6 @@ wuffs_jpeg__decoder__decode_mcu_progressive_ac_high_bits( v_ac_value += (v_ac_extend & (((uint16_t)(wuffs_base__utility__sign_extend_rshift_u64(v_bits, 63u))) ^ 65535u)); v_bits <<= v_ac_ssss; v_n_bits -= v_ac_ssss; - v_z += (v_ac_rrrr + 1u); self->private_data.f_mcu_blocks[0u][WUFFS_JPEG__UNZIG[v_z]] = ((uint16_t)(((uint16_t)(v_ac_value << self->private_impl.f_scan_al)))); } else if (v_ac_rrrr < 15u) { self->private_impl.f_eob_run = ((uint16_t)(((((uint16_t)(1u)) << v_ac_rrrr) - 1u))); @@ -41910,8 +41908,6 @@ wuffs_jpeg__decoder__decode_mcu_progressive_ac_high_bits( v_n_bits -= v_ac_rrrr; } goto label__ac_components__break; - } else { - v_z += 16u; } } label__ac_components__break:; diff --git a/std/jpeg/decode_mcu_default.wuffs b/std/jpeg/decode_mcu_default.wuffs index 1ba21091..09f1d7c3 100644 --- a/std/jpeg/decode_mcu_default.wuffs +++ b/std/jpeg/decode_mcu_default.wuffs @@ -204,6 +204,7 @@ pri func decoder.decode_mcu!(workbuf: slice base.u8, mx: base.u32[..= 0x1FFF], m // Split the 8-bit ac_symbol into two 4-bit halves, per section // F.2.2.2 "Decoding procedure for AC coefficients". ac_rrrr = ac_symbol >> 4 + z += ac_rrrr + 1 ac_ssss = ac_symbol & 15 ac_extend = EXTEND[ac_ssss] @@ -214,13 +215,10 @@ pri func decoder.decode_mcu!(workbuf: slice base.u8, mx: base.u32[..= 0x1FFF], m (((this.util.sign_extend_rshift_u64(a: bits, n: 63) & 0xFFFF) as base.u16) ^ 0xFFFF) bits ~mod<<= ac_ssss n_bits ~mod-= ac_ssss - z += ac_rrrr + 1 this.mcu_blocks[0][UNZIG[z]] = ac_value } else if ac_rrrr < 15 { break.ac_components - } else { - z += 16 } } endwhile.ac_components diff --git a/std/jpeg/decode_mcu_progressive_ac_high_bits.wuffs b/std/jpeg/decode_mcu_progressive_ac_high_bits.wuffs index 7493b40a..4017b995 100644 --- a/std/jpeg/decode_mcu_progressive_ac_high_bits.wuffs +++ b/std/jpeg/decode_mcu_progressive_ac_high_bits.wuffs @@ -120,6 +120,7 @@ pri func decoder.decode_mcu_progressive_ac_high_bits!(workbuf: slice base.u8, mx // Split the 8-bit ac_symbol into two 4-bit halves, per section // F.2.2.2 "Decoding procedure for AC coefficients". ac_rrrr = ac_symbol >> 4 + z += ac_rrrr + 1 ac_ssss = ac_symbol & 15 ac_extend = EXTEND[ac_ssss] @@ -131,7 +132,6 @@ pri func decoder.decode_mcu_progressive_ac_high_bits!(workbuf: slice base.u8, mx (((this.util.sign_extend_rshift_u64(a: bits, n: 63) & 0xFFFF) as base.u16) ^ 0xFFFF) bits ~mod<<= ac_ssss n_bits ~mod-= ac_ssss - z += ac_rrrr + 1 this.mcu_blocks[0][UNZIG[z]] = ((ac_value ~mod<< this.scan_al) & 0xFFFF) as base.u16 } else if ac_rrrr < 15 { @@ -142,8 +142,6 @@ pri func decoder.decode_mcu_progressive_ac_high_bits!(workbuf: slice base.u8, mx n_bits ~mod-= ac_rrrr } break.ac_components - } else { - z += 16 } } endwhile.ac_components