fixed record device handling of font->{ascent,descent}

[swftools.git] / lib / devices / record.c

diff --git a/lib/devices/record.c b/lib/devices/record.c
index a4b0859..4cc75dd 100644 (file)
--- a/lib/devices/record.c
+++ b/lib/devices/record.c
@@ -241,6 +241,8 @@ static void dumpFont(writer_t*w, gfxfont_t*font)
     writer_writeString(w, font->id);
     writer_writeU32(w, font->num_glyphs);
     writer_writeU32(w, font->max_unicode);
+    writer_writeDouble(w, font->ascent);
+    writer_writeDouble(w, font->descent);
     int t;
     for(t=0;t<font->num_glyphs;t++) {
        dumpLine(w, font->glyphs[t].line);
@@ -262,6 +264,8 @@ static gfxfont_t*readFont(reader_t*r)
     font->id = reader_readString(r);
     font->num_glyphs = reader_readU32(r);
     font->max_unicode = reader_readU32(r);
+    font->ascent = reader_readDouble(r);
+    font->descent = reader_readDouble(r);
     font->glyphs = (gfxglyph_t*)rfx_calloc(sizeof(gfxglyph_t)*font->num_glyphs);
     font->unicode2glyph = (int*)rfx_calloc(sizeof(font->unicode2glyph[0])*font->max_unicode);
     int t;
@@ -348,7 +352,7 @@ static void record_fillgradient(struct _gfxdevice*dev, gfxline_t*line, gfxgradie
 static void record_addfont(struct _gfxdevice*dev, gfxfont_t*font)
 {
     internal_t*i = (internal_t*)dev->internal;
-    msg("<trace> record: %08x ADDFONT %s\n", dev);
+    msg("<trace> record: %08x ADDFONT %s\n", dev, font->id);
     if(font && !gfxfontlist_hasfont(i->fontlist, font)) {
        writer_writeU8(&i->w, OP_ADDFONT);
        dumpFont(&i->w, font);
@@ -415,17 +419,7 @@ static void replay(struct _gfxdevice*dev, gfxdevice_t*out, void*data, int length
        unsigned char op = reader_readU8(r);
        switch(op) {
            case OP_END:
-               r->dealloc(r);
-
-               {
-                   gfxfontlist_t*l = fontlist;
-                   while(l) {
-                       l = l->next;
-                   }
-               }
-
-               gfxfontlist_free(fontlist, 1);
-               return;
+               goto finish;
            case OP_SETPARAM: {
                msg("<trace> replay: SETPARAM");
                char*key;
@@ -557,7 +551,13 @@ static void replay(struct _gfxdevice*dev, gfxdevice_t*out, void*data, int length
            }
        }
     }
-    msg("<error> No END token in gfx recording");
+finish:
+    r->dealloc(r);
+    /* problem: if we just replayed into a device which stores the
+       font for later use (the record device itself is a nice example),
+       then we can't free it yet */
+    //gfxfontlist_free(fontlist, 1);
+    gfxfontlist_free(fontlist, 0);
 }
 void gfxresult_record_replay(gfxresult_t*result, gfxdevice_t*device)
 {