X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=lib%2Fdevices%2Frecord.c;h=3485840978b1df634485db678637bf38d7d0457e;hp=796e086098a873b1b9257281738af933ba1d363e;hb=9e1987ca321def20b6f756bb5955d41c78c45c05;hpb=b2b02120bcfd17bc5733769f9e0591dfb6329429 diff --git a/lib/devices/record.c b/lib/devices/record.c index 796e086..3485840 100644 --- a/lib/devices/record.c +++ b/lib/devices/record.c @@ -34,6 +34,7 @@ #include #include "../gfxdevice.h" #include "../gfxtools.h" +#include "../gfxfont.h" #include "../types.h" #include "../bitio.h" #include "../log.h" @@ -97,6 +98,7 @@ typedef struct _internal_result { #define OP_FINISH 0x0d #define FLAG_SAME_AS_LAST 0x10 +#define FLAG_ZERO_FONT 0x20 #define LINE_MOVETO 0x0e #define LINE_LINETO 0x0f @@ -185,6 +187,7 @@ static void dumpImage(writer_t*w, state_t*state, gfximage_t*img) //48.0% images (3488650 bytes) (without filter, Z_BEST_SPEED) //55.3% images (4665889 bytes) (without filter, fastlz level 2) //55.6% images (4726334 bytes) (without filter, fastlz level 1) + //83.0% images (18091804 bytes) (no compression) gfxcolor_t*image; #ifdef FILTER_IMAGES @@ -206,7 +209,7 @@ static void dumpImage(writer_t*w, state_t*state, gfximage_t*img) #ifdef HAVE_FASTLZ compressdata_size = fastlz_compress_level(2, (void*)image, size*sizeof(gfxcolor_t), compressdata); #else - compress2(compressdata, &compressdata_size, (void*)image, sizeof(gfxcolor_t)*size, 6); + compress2(compressdata, &compressdata_size, (void*)image, sizeof(gfxcolor_t)*size, Z_BEST_SPEED); #endif writer_writeU32(w, compressdata_size); @@ -578,16 +581,22 @@ static void record_drawchar(struct _gfxdevice*dev, gfxfont_t*font, int glyphnr, } msg(" record: %08x DRAWCHAR %d\n", glyphnr, dev); - const char*font_id = font->id?font->id:"*NULL*"; + const char*font_id = (font&&font->id)?font->id:"*NULL*"; gfxmatrix_t*l = &i->state.last_matrix[OP_DRAWCHAR]; + U8 flags = 0; + if(!font) + flags |= FLAG_ZERO_FONT; + char same_font = i->state.last_string[OP_DRAWCHAR] && !strcmp(i->state.last_string[OP_DRAWCHAR], font_id); char same_matrix = (l->m00 == matrix->m00) && (l->m01 == matrix->m01) && (l->m10 == matrix->m10) && (l->m11 == matrix->m11); char same_color = !memcmp(color, &i->state.last_color[OP_DRAWCHAR], sizeof(gfxcolor_t)); - U8 flags = 0; + + /* FIXME if(same_font && same_matrix && same_color) flags |= FLAG_SAME_AS_LAST; + */ writer_writeU8(&i->w, OP_DRAWCHAR|flags); writer_writeU32(&i->w, glyphnr); @@ -596,7 +605,8 @@ static void record_drawchar(struct _gfxdevice*dev, gfxfont_t*font, int glyphnr, #endif if(!(flags&FLAG_SAME_AS_LAST)) { - writer_writeString(&i->w, font_id); + if(!(flags&FLAG_ZERO_FONT)) + writer_writeString(&i->w, font_id); dumpColor(&i->w, &i->state, color); dumpMatrix(&i->w, &i->state, matrix); i->state.last_string[OP_DRAWCHAR] = strdup(font_id); @@ -634,18 +644,20 @@ static void record_drawlink(struct _gfxdevice*dev, gfxline_t*line, const char*ac /* ------------------------------- replaying --------------------------------- */ -static void replay(struct _gfxdevice*dev, gfxdevice_t*out, reader_t*r) +static void replay(struct _gfxdevice*dev, gfxdevice_t*out, reader_t*r, gfxfontlist_t**fontlist) { internal_t*i = 0; if(dev) { i = (internal_t*)dev->internal; } + gfxfontlist_t*_fontlist=0; + if(!fontlist) { + fontlist = &_fontlist; + } state_t state; memset(&state, 0, sizeof(state)); - gfxfontlist_t* fontlist = gfxfontlist_create(); - while(1) { unsigned char op; if(r->read(r, &op, 1)!=1) @@ -768,37 +780,42 @@ static void replay(struct _gfxdevice*dev, gfxdevice_t*out, reader_t*r) case OP_ADDFONT: { msg(" replay: ADDFONT out=%08x(%s)", out, out->name); gfxfont_t*font = readFont(r, &state); - fontlist = gfxfontlist_addfont(fontlist, font); - out->addfont(out, font); + if(!gfxfontlist_hasfont(*fontlist, font)) { + printf("%08x / %08x: font %s is new\n", out, *fontlist, font->id); + *fontlist = gfxfontlist_addfont(*fontlist, font); + out->addfont(out, font); + } else { + gfxfont_free(font); + } break; } case OP_DRAWCHAR: { U32 glyph = reader_readU32(r); gfxmatrix_t m = {1,0,0, 0,1,0}; - char* id = read_string(r, &state, op, flags); + char* id = 0; + if(!(flags&FLAG_ZERO_FONT)) + id = read_string(r, &state, op, flags); gfxcolor_t color = read_color(r, &state, op, flags); gfxmatrix_t matrix = read_matrix(r, &state, op, flags); - gfxfont_t*font = id?gfxfontlist_findfont(fontlist, id):0; + gfxfont_t*font = id?gfxfontlist_findfont(*fontlist, id):0; if(i && !font) { font = gfxfontlist_findfont(i->fontlist, id); } msg(" replay: DRAWCHAR font=%s glyph=%d", id, glyph); out->drawchar(out, font, glyph, &color, &matrix); - free(id); + if(id) + free(id); break; } } } 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); + if(_fontlist) + gfxfontlist_free(_fontlist, 0); } -void gfxresult_record_replay(gfxresult_t*result, gfxdevice_t*device) +void gfxresult_record_replay(gfxresult_t*result, gfxdevice_t*device, gfxfontlist_t**fontlist) { internal_result_t*i = (internal_result_t*)result->internal; @@ -809,7 +826,7 @@ void gfxresult_record_replay(gfxresult_t*result, gfxdevice_t*device) reader_init_memreader(&r, i->data, i->length); } - replay(0, device, &r); + replay(0, device, &r, fontlist); } static void record_result_write(gfxresult_t*r, int filedesc) @@ -884,7 +901,7 @@ static void hexdumpMem(unsigned char*data, int len) } } -void gfxdevice_record_flush(gfxdevice_t*dev, gfxdevice_t*out) +void gfxdevice_record_flush(gfxdevice_t*dev, gfxdevice_t*out, gfxfontlist_t**fontlist) { internal_t*i = (internal_t*)dev->internal; if(out) { @@ -893,7 +910,7 @@ void gfxdevice_record_flush(gfxdevice_t*dev, gfxdevice_t*out) void*data = writer_growmemwrite_memptr(&i->w, &len); reader_t r; reader_init_memreader(&r, data, len); - replay(dev, out, &r); + replay(dev, out, &r, fontlist); writer_growmemwrite_reset(&i->w); } else { msg(" Flushing not supported for file based record device");