diff --git a/cmd/wuffs-c/internal/cgen/builtin.go b/cmd/wuffs-c/internal/cgen/builtin.go index 8391301f..47bec71f 100644 --- a/cmd/wuffs-c/internal/cgen/builtin.go +++ b/cmd/wuffs-c/internal/cgen/builtin.go @@ -174,7 +174,7 @@ func (g *gen) writeBuiltinIOReader(b *buffer, recv *a.Expr, method t.ID, args [] } func (g *gen) writeBuiltinIOWriter(b *buffer, recv *a.Expr, method t.ID, args []*a.Node, depth uint32) error { - // TODO: don't hard-code the recv being a_dst. + // TODO: don't hard-code the recv being a_dst or w. switch method { case t.IDCopyNFromHistory, t.IDCopyNFromHistoryFast: suffix := "" @@ -224,10 +224,14 @@ func (g *gen) writeBuiltinIOWriter(b *buffer, recv *a.Expr, method t.ID, args [] return nil case t.IDSinceMark: + prefix, name := aPrefix, "dst" + if recv.Operator() == 0 { + prefix, name = vPrefix, recv.Ident().Str(g.tm) + } b.printf("((wuffs_base__slice_u8){ "+ - ".ptr = %sdst.private_impl.mark, "+ - ".len = (size_t)(iop_a_dst - %sdst.private_impl.mark), })", - aPrefix, aPrefix) + ".ptr = %s%s.private_impl.mark, "+ + ".len = (size_t)(iop_%s%s - %s%s.private_impl.mark), })", + prefix, name, prefix, name, prefix, name) return nil } diff --git a/release/c/wuffs-unsupported-snapshot.h b/release/c/wuffs-unsupported-snapshot.h index dbcf2972..819ed4a8 100644 --- a/release/c/wuffs-unsupported-snapshot.h +++ b/release/c/wuffs-unsupported-snapshot.h @@ -9191,6 +9191,7 @@ wuffs_gif__decoder__decode_id_part1(wuffs_gif__decoder* self, WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iop_v_w); WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(io1_v_w); wuffs_base__status v_z; + uint64_t v_wi; uint8_t* iop_a_src = NULL; uint8_t* io0_a_src = NULL; @@ -9222,6 +9223,7 @@ wuffs_gif__decoder__decode_id_part1(wuffs_gif__decoder* self, v_block_size = self->private_impl.c_decode_id_part1[0].v_block_size; v_w = ((wuffs_base__io_writer){}); v_z = NULL; + v_wi = 0; } else { v_dst_palette = ((wuffs_base__slice_u8){}); v_w = ((wuffs_base__io_writer){}); @@ -9420,9 +9422,16 @@ wuffs_gif__decoder__decode_id_part1(wuffs_gif__decoder* self, } v_z = t_4; } + v_wi = wuffs_base__u64__sat_add( + ((uint64_t)(self->private_impl.f_uncompressed_wi)), + ((uint64_t)( + ((wuffs_base__slice_u8){ + .ptr = v_w.private_impl.mark, + .len = (size_t)(iop_v_w - v_w.private_impl.mark), + }) + .len))); self->private_impl.f_uncompressed_wi = - (4096 - ((uint32_t)(wuffs_base__u64__min( - ((uint64_t)(io1_v_w - iop_v_w)), 4096)))); + ((uint32_t)(wuffs_base__u64__min(v_wi, 4096))); wuffs_base__u64__sat_sub_indirect( &v_block_size, ((uint64_t)( diff --git a/std/gif/decode_gif.wuffs b/std/gif/decode_gif.wuffs index bbedf377..e26ce9cb 100644 --- a/std/gif/decode_gif.wuffs +++ b/std/gif/decode_gif.wuffs @@ -640,7 +640,8 @@ pri func decoder.decode_id_part1!??(dst ptr base.pixel_buffer, src base.io_reade io_limit (io:args.src, limit:block_size) { args.src.set_mark!() var z base.status =? this.lzw.decode!??(dst:w, src:args.src) - this.uncompressed_wi = 4096 - (w.available().min(x:4096) as base.u32) + var wi base.u64 = (this.uncompressed_wi as base.u64) ~sat+ w.since_mark().length() + this.uncompressed_wi = wi.min(x:4096) as base.u32 block_size ~sat-= args.src.since_mark().length() } }