X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fdevices%2Frecord.c;h=cf04db6a03a2b0975eda257ff9ec14dec9df76b1;hb=161eb9ef43958996250c3786802a013e1ac549de;hp=9af6530e507d800a187ce34bbc539b5bc8ea54fc;hpb=a55572f73250f9db598d0f9fffe05a7d5198e4b5;p=swftools.git

diff --git a/lib/devices/record.c b/lib/devices/record.c
index 9af6530..cf04db6 100644
--- a/lib/devices/record.c
+++ b/lib/devices/record.c
@@ -40,6 +40,7 @@
 typedef struct _internal {
     gfxfontlist_t* fontlist;
     writer_t w;
+    int cliplevel;
 } internal_t;
 
 typedef struct _internal_result {
@@ -240,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);
@@ -254,6 +257,12 @@ static void dumpFont(writer_t*w, gfxfont_t*font)
     for(t=0;t<font->max_unicode;t++) {
 	writer_writeU32(w, font->unicode2glyph[t]);
     }
+    writer_writeU32(w, font->kerning_size);
+    for(t=0;t<font->kerning_size;t++) {
+	writer_writeU32(w, font->kerning[t].c1);
+	writer_writeU32(w, font->kerning[t].c2);
+	writer_writeU32(w, font->kerning[t].advance);
+    }
 }
 static gfxfont_t*readFont(reader_t*r)
 {
@@ -261,6 +270,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;
@@ -277,6 +288,15 @@ static gfxfont_t*readFont(reader_t*r)
     for(t=0;t<font->max_unicode;t++) {
 	font->unicode2glyph[t] = reader_readU32(r);
     }
+    font->kerning_size = reader_readU32(r);
+    if(font->kerning_size) {
+	font->kerning = malloc(sizeof(gfxkerning_t)*font->kerning_size);
+	for(t=0;t<font->kerning_size;t++) {
+	    font->kerning[t].c1 = reader_readU32(r);
+	    font->kerning[t].c2 = reader_readU32(r);
+	    font->kerning[t].advance = reader_readU32(r);
+	}
+    }
     return font;
 }
 
@@ -299,6 +319,7 @@ static void record_startclip(struct _gfxdevice*dev, gfxline_t*line)
     msg("<trace> record: %08x STARTCLIP\n", dev);
     writer_writeU8(&i->w, OP_STARTCLIP);
     dumpLine(&i->w, line);
+    i->cliplevel++;
 }
 
 static void record_endclip(struct _gfxdevice*dev)
@@ -306,6 +327,10 @@ static void record_endclip(struct _gfxdevice*dev)
     internal_t*i = (internal_t*)dev->internal;
     msg("<trace> record: %08x ENDCLIP\n", dev);
     writer_writeU8(&i->w, OP_ENDCLIP);
+    i->cliplevel--;
+    if(i->cliplevel<0) {
+	msg("<error> record: endclip() without startclip()");
+    }
 }
 
 static void record_fill(struct _gfxdevice*dev, gfxline_t*line, gfxcolor_t*color)
@@ -342,10 +367,12 @@ 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\n", dev);
-    writer_writeU8(&i->w, OP_ADDFONT);
-    dumpFont(&i->w, font);
-    i->fontlist = gfxfontlist_addfont(i->fontlist, font);
+    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);
+	i->fontlist = gfxfontlist_addfont(i->fontlist, font);
+    }
 }
 
 static void record_drawchar(struct _gfxdevice*dev, gfxfont_t*font, int glyphnr, gfxcolor_t*color, gfxmatrix_t*matrix)
@@ -353,7 +380,6 @@ static void record_drawchar(struct _gfxdevice*dev, gfxfont_t*font, int glyphnr,
     internal_t*i = (internal_t*)dev->internal;
     if(font && !gfxfontlist_hasfont(i->fontlist, font)) {
 	record_addfont(dev, font);
-	i->fontlist = gfxfontlist_addfont(i->fontlist, font);
     }
 
     msg("<trace> record: %08x DRAWCHAR %d\n", glyphnr, dev);
@@ -408,8 +434,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:
-		msg("<trace> replay: END");
-		return;
+		goto finish;
 	    case OP_SETPARAM: {
 		msg("<trace> replay: SETPARAM");
 		char*key;
@@ -487,6 +512,7 @@ static void replay(struct _gfxdevice*dev, gfxdevice_t*out, void*data, int length
 		gfxline_t* line = readLine(r);
 		gfxcxform_t* cxform = readCXForm(r);
 		out->fillbitmap(out, line, &img, &matrix, cxform);
+		gfxline_free(line);
 		if(cxform)
 		    free(cxform);
 		free(img.data);img.data=0;
@@ -540,8 +566,13 @@ static void replay(struct _gfxdevice*dev, gfxdevice_t*out, void*data, int length
 	    }
 	}
     }
+finish:
     r->dealloc(r);
-    gfxfontlist_free(fontlist, 1);
+    /* 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)
 {
@@ -625,7 +656,11 @@ void gfxdevice_record_flush(gfxdevice_t*dev, gfxdevice_t*out)
 static gfxresult_t* record_finish(struct _gfxdevice*dev)
 {
     internal_t*i = (internal_t*)dev->internal;
-    msg("<trace> record: %08x END\n", dev);
+    msg("<trace> record: %08x END", dev);
+
+    if(i->cliplevel) {
+	msg("<error> Warning: unclosed cliplevels");
+    }
     
     writer_writeU8(&i->w, OP_END);
     
@@ -657,6 +692,7 @@ void gfxdevice_record_init(gfxdevice_t*dev)
     
     writer_init_growingmemwriter(&i->w, 1048576);
     i->fontlist = gfxfontlist_create();
+    i->cliplevel = 0;
 
     dev->setparameter = record_setparameter;
     dev->startpage = record_startpage;