git.asbjorn.biz
/
swftools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed format warnings
[swftools.git]
/
lib
/
devices
/
record.c
diff --git
a/lib/devices/record.c
b/lib/devices/record.c
index
5ea7d1b
..
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_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);
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->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;
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;
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);
if(font && !gfxfontlist_hasfont(i->fontlist, font)) {
writer_writeU8(&i->w, OP_ADDFONT);
dumpFont(&i->w, font);
@@
-549,7
+553,11
@@
static void replay(struct _gfxdevice*dev, gfxdevice_t*out, void*data, int length
}
finish:
r->dealloc(r);
}
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)
{
}
void gfxresult_record_replay(gfxresult_t*result, gfxdevice_t*device)
{