Reset the GIF's LZW decoder if necessary

This commit is contained in:
Nigel Tao committed 2018-05-10 14:42:10 +10:00
1 parent 614ac408ae
commit 8586cf8e3d
7 files changed
+25 -6

No files matched your search

+6
View File
@@ -333,6 +333,12 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare
b.printf(")")
return nil
}
if isThatMethod(g.tm, n, t.IDReset, 0) {
// TODO: don't hard-code f_lzw.
b.writes("wuffs_gif__lzw_decoder__initialize(" +
"&self->private_impl.f_lzw, WUFFS_VERSION, 0)")
return nil
}
// TODO.
case t.IDOpenBracket:
+2 -1
View File
@@ -19,6 +19,7 @@
- Renamed `u32`, `io_reader`, etc to `base.u32`, `base.io_reader`, etc.
- Redesigned iterate blocks.
- Added a `base.image_config` type.
- Added a `reset` method.
- Tweaked how marks and limits work.
- Supported animated (not just single frame) GIFs.
- Marked the `std/gif` LZW decoder as private.
@@ -42,4 +43,4 @@
---
Updated on April 2018.
Updated on May 2018.
+2
View File
@@ -2865,6 +2865,8 @@ static wuffs_gif__status wuffs_gif__decoder__decode_id(
}
}
if (self->private_impl.f_previous_lzw_decode_ended_abruptly) {
wuffs_gif__lzw_decoder__initialize(&self->private_impl.f_lzw,
WUFFS_VERSION, 0);
}
{
WUFFS_BASE__COROUTINE_SUSPENSION_POINT(13);
+9
View File
@@ -128,6 +128,7 @@ var phases = [...]struct {
{a.KStatus, (*Checker).checkStatus},
{a.KConst, (*Checker).checkConst},
{a.KStruct, (*Checker).checkStructDecl},
{a.KStruct, (*Checker).checkImplicitResetMethod},
{a.KInvalid, (*Checker).checkStructCycles},
{a.KStruct, (*Checker).checkStructFields},
{a.KFunc, (*Checker).checkFuncSignature},
@@ -392,6 +393,14 @@ func (c *Checker) checkStructDecl(node *a.Node) error {
return nil
}
func (c *Checker) checkImplicitResetMethod(node *a.Node) error {
n := node.Struct()
in := a.NewStruct(0, n.Filename(), n.Line(), t.IDIn, nil)
out := a.NewStruct(0, n.Filename(), n.Line(), t.IDOut, nil)
f := a.NewFunc(0, n.Filename(), n.Line(), n.QID()[1], t.IDReset, in, out, nil, nil)
return c.checkFuncSignature(f.Node())
}
func (c *Checker) checkStructCycles(_ *a.Node) error {
if _, ok := a.TopologicalSortStructs(c.unsortedStructs); !ok {
return fmt.Errorf("check: cyclical struct definitions")
+2
View File
@@ -440,6 +440,7 @@ const (
IDIn = ID(0x142)
IDOut = ID(0x143)
IDBase = ID(0x144)
IDReset = ID(0x145)
// -------- 0x200 block.
@@ -629,6 +630,7 @@ var builtInsByID = [nBuiltInIDs]string{
IDIn: "in",
IDOut: "out",
IDBase: "base",
IDReset: "reset",
// -------- 0x200 block.
+1 -1
View File
@@ -301,7 +301,7 @@ pri func decoder.decode_id?(dst base.io_writer, src base.io_reader)() {
}
if this.previous_lzw_decode_ended_abruptly {
// TODO: reset this.lzw.
this.lzw.reset()
}
var lw base.u8 = in.src.read_u8?()
+3 -4
View File
@@ -624,8 +624,8 @@ bool do_test_wuffs_gif_decode_animated(const char* filename,
void test_wuffs_gif_decode_animated_big() {
CHECK_FOCUS(__func__);
// TODO: uncomment.
// do_test_wuffs_gif_decode_animated("../../data/gifplayer-muybridge.gif", 0, 0);
do_test_wuffs_gif_decode_animated("../../data/gifplayer-muybridge.gif", 0,
380);
}
void test_wuffs_gif_decode_animated_medium() {
@@ -752,8 +752,7 @@ void test_mimic_gif_decode_bricks_nodither() {
void test_mimic_gif_decode_gifplayer_muybridge() {
CHECK_FOCUS(__func__);
// TODO: uncomment.
// do_test_mimic_gif_decode("../../data/gifplayer-muybridge.gif");
do_test_mimic_gif_decode("../../data/gifplayer-muybridge.gif");
}
void test_mimic_gif_decode_harvesters() {