diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index 8d5773fb..727ae8d4 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -40585,17 +40585,29 @@ wuffs_png__decoder__filter_and_swizzle__choosy_default( v_dst_bytes_per_row1 = (((uint64_t)(self->private_impl.f_frame_rect_x1)) * v_dst_bytes_per_pixel); v_dst_palette = wuffs_base__pixel_buffer__palette_or_else(a_dst, wuffs_base__make_slice_u8(self->private_data.f_dst_palette, 1024)); v_tab = wuffs_base__pixel_buffer__plane(a_dst, 0); + if (v_dst_bytes_per_row1 < ((uint64_t)(v_tab.width))) { + v_tab = wuffs_base__table_u8__subtable_ij(v_tab, + 0, + 0, + v_dst_bytes_per_row1, + ((uint64_t)(v_tab.height))); + } + if (v_dst_bytes_per_row0 < ((uint64_t)(v_tab.width))) { + v_tab = wuffs_base__table_u8__subtable_ij(v_tab, + v_dst_bytes_per_row0, + 0, + ((uint64_t)(v_tab.width)), + ((uint64_t)(v_tab.height))); + } else { + v_tab = wuffs_base__table_u8__subtable_ij(v_tab, + 0, + 0, + 0, + 0); + } v_y = self->private_impl.f_frame_rect_y0; while (v_y < self->private_impl.f_frame_rect_y1) { v_dst = wuffs_base__table_u8__row(v_tab, v_y); - if (v_dst_bytes_per_row1 < ((uint64_t)(v_dst.len))) { - v_dst = wuffs_base__slice_u8__subslice_j(v_dst, v_dst_bytes_per_row1); - } - if (v_dst_bytes_per_row0 < ((uint64_t)(v_dst.len))) { - v_dst = wuffs_base__slice_u8__subslice_i(v_dst, v_dst_bytes_per_row0); - } else { - v_dst = wuffs_base__utility__empty_slice_u8(); - } if (1 > ((uint64_t)(a_workbuf.len))) { return wuffs_base__make_status(wuffs_png__error__internal_error_inconsistent_workbuf_length); } diff --git a/std/png/decode_swizzle_default.wuffs b/std/png/decode_swizzle_default.wuffs index f95a6cce..42db1914 100644 --- a/std/png/decode_swizzle_default.wuffs +++ b/std/png/decode_swizzle_default.wuffs @@ -42,18 +42,32 @@ pri func decoder.filter_and_swizzle!(dst: ptr base.pixel_buffer, workbuf: slice dst_palette = args.dst.palette_or_else(fallback: this.dst_palette[..]) tab = args.dst.plane(p: 0) + if dst_bytes_per_row1 < tab.width() { + tab = tab.subtable( + min_incl_x: 0, + min_incl_y: 0, + max_incl_x: dst_bytes_per_row1, + max_incl_y: tab.height()) + } + + if dst_bytes_per_row0 < tab.width() { + tab = tab.subtable( + min_incl_x: dst_bytes_per_row0, + min_incl_y: 0, + max_incl_x: tab.width(), + max_incl_y: tab.height()) + } else { + tab = tab.subtable( + min_incl_x: 0, + min_incl_y: 0, + max_incl_x: 0, + max_incl_y: 0) + } + y = this.frame_rect_y0 while y < this.frame_rect_y1 { assert y < 0x00FF_FFFF via "a < b: a < c; c <= b"(c: this.frame_rect_y1) dst = tab.row(y: y) - if dst_bytes_per_row1 < dst.length() { - dst = dst[.. dst_bytes_per_row1] - } - if dst_bytes_per_row0 < dst.length() { - dst = dst[dst_bytes_per_row0 ..] - } else { - dst = this.util.empty_slice_u8() - } if 1 > args.workbuf.length() { return "#internal error: inconsistent workbuf length"