diff --git a/cmd/wuffs-c/internal/cgen/expr.go b/cmd/wuffs-c/internal/cgen/expr.go index 502aad41..17c068d6 100644 --- a/cmd/wuffs-c/internal/cgen/expr.go +++ b/cmd/wuffs-c/internal/cgen/expr.go @@ -321,11 +321,6 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare b.writes(")\n") return nil } - if isThatMethod(g.tm, n, t.IDMark, 0) { - // TODO: don't hard-code v_r or b_rptr_src. - b.printf("wuffs_base__io_reader__mark(&v_r, b_rptr_src)") - return nil - } if isThatMethod(g.tm, n, g.tm.ByName("initialize"), 5) { // TODO: don't hard-code a_dst. b.printf("wuffs_base__image_config__initialize(a_dst") diff --git a/cmd/wuffs-c/internal/cgen/statement.go b/cmd/wuffs-c/internal/cgen/statement.go index 4a2a283f..beedd72c 100644 --- a/cmd/wuffs-c/internal/cgen/statement.go +++ b/cmd/wuffs-c/internal/cgen/statement.go @@ -744,10 +744,10 @@ func (g *gen) writeCallSuspendibles(b *buffer, n *a.Expr, depth uint32) error { temp := g.currFunk.tempW g.currFunk.tempW++ - // TODO: don't hard-code a_dst or v_r. - b.printf("%sstatus %s%d = %slzw_decoder__decode(&self->private_impl.f_lzw, %sdst, %sr);\n", + // TODO: don't hard-code a_dst or a_src. + b.printf("%sstatus %s%d = %slzw_decoder__decode(&self->private_impl.f_lzw, %sdst, %ssrc);\n", g.pkgPrefix, tPrefix, temp, - g.pkgPrefix, aPrefix, vPrefix) + g.pkgPrefix, aPrefix, aPrefix) if err := g.writeLoadExprDerivedVars(b, n); err != nil { return err } diff --git a/gen/c/std/gif.c b/gen/c/std/gif.c index bf0f7f6c..b4f7cbc6 100644 --- a/gen/c/std/gif.c +++ b/gen/c/std/gif.c @@ -2711,7 +2711,6 @@ static wuffs_gif__status wuffs_gif__decoder__decode_id( uint32_t v_i; uint8_t v_lw; uint64_t v_block_size; - wuffs_base__io_reader v_r; wuffs_gif__status v_z; uint8_t* b_rptr_src = NULL; @@ -2735,7 +2734,6 @@ static wuffs_gif__status wuffs_gif__decoder__decode_id( v_i = self->private_impl.c_decode_id[0].v_i; v_lw = self->private_impl.c_decode_id[0].v_lw; v_block_size = self->private_impl.c_decode_id[0].v_block_size; - v_r = ((wuffs_base__io_reader){}); v_z = self->private_impl.c_decode_id[0].v_z; } else { } @@ -2931,15 +2929,23 @@ static wuffs_gif__status wuffs_gif__decoder__decode_id( a_src.private_impl.buf ? (b_rptr_src - a_src.private_impl.buf->ptr) : 0); - v_r = a_src; { + if (a_src.private_impl.buf) { + size_t n = b_rptr_src - (a_src.private_impl.buf->ptr + + a_src.private_impl.buf->ri); + a_src.private_impl.buf->ri += n; + } if (a_src.private_impl.buf) { size_t n = b_rptr_src - (a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri); a_src.private_impl.buf->ri += n; } wuffs_gif__status t_14 = wuffs_gif__lzw_decoder__decode( - &self->private_impl.f_lzw, a_dst, v_r); + &self->private_impl.f_lzw, a_dst, a_src); + if (a_src.private_impl.buf) { + b_rptr_src = + a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri; + } if (a_src.private_impl.buf) { b_rptr_src = a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri; diff --git a/std/gif/decode_gif.wuffs b/std/gif/decode_gif.wuffs index 84d9c0b6..f610b60e 100644 --- a/std/gif/decode_gif.wuffs +++ b/std/gif/decode_gif.wuffs @@ -314,11 +314,10 @@ pri func decoder.decode_id?(dst base.io_writer, src base.io_reader)() { in.src.mark() io_bind (in.src) { in.src.set_limit(l:block_size) - var r base.io_reader = in.src // TODO: remove the dummy param. It's needed for now so that // writeSaveExprDerivedVars updates e.g. the b_rptr_src derived // variables. - var z base.status = try this.lzw.decode?(dst:in.dst, src:r, dummy:in.src) + var z base.status = try this.lzw.decode?(dst:in.dst, src:in.src, dummy:in.src) } if z.is_ok() { break