diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index a79fa07f..a81ed391 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -31021,17 +31021,21 @@ wuffs_png__decoder__filter_1( wuffs_png__decoder* self, wuffs_base__slice_u8 a_curr) { uint64_t v_filter_distance = 0; + uint8_t v_fa = 0; + uint64_t v_i_start = 0; uint64_t v_i = 0; v_filter_distance = ((uint64_t)(self->private_impl.f_filter_distance)); - v_i = v_filter_distance; - while (v_i < ((uint64_t)(a_curr.len))) { - if (v_i >= v_filter_distance) { - if ((v_i - v_filter_distance) < ((uint64_t)(a_curr.len))) { - a_curr.ptr[v_i] += a_curr.ptr[(v_i - v_filter_distance)]; - } + v_i_start = 0; + while (v_i_start < v_filter_distance) { + v_fa = 0; + v_i = v_i_start; + while (v_i < ((uint64_t)(a_curr.len))) { + a_curr.ptr[v_i] += v_fa; + v_fa = a_curr.ptr[v_i]; + v_i += v_filter_distance; } - v_i += 1; + v_i_start += 1; } return wuffs_base__make_empty_struct(); } diff --git a/std/png/decode_png.wuffs b/std/png/decode_png.wuffs index 0e9b4cb1..5c1e6a45 100644 --- a/std/png/decode_png.wuffs +++ b/std/png/decode_png.wuffs @@ -463,18 +463,24 @@ pri func decoder.filter_and_swizzle!(dst: ptr base.pixel_buffer, workbuf: slice pri func decoder.filter_1!(curr: slice base.u8) { var filter_distance : base.u64[..= 8] + var fa : base.u8 + var i_start : base.u64 var i : base.u64 filter_distance = this.filter_distance as base.u64 - i = filter_distance - while i < args.curr.length() { - assert i < 0xFFFF_FFFF_FFFF_FFFF via "a < b: a < c; c <= b"(c: args.curr.length()) - if i >= filter_distance { - if (i - filter_distance) < args.curr.length() { - args.curr[i] ~mod+= args.curr[i - filter_distance] - } - } - i += 1 + i_start = 0 + while i_start < filter_distance { + assert i_start < 8 via "a < b: a < c; c <= b"(c: filter_distance) + fa = 0 + i = i_start + while i < args.curr.length(), + inv i_start < 8, + { + args.curr[i] ~mod+= fa + fa = args.curr[i] + i ~mod+= filter_distance + } endwhile + i_start += 1 } endwhile }