X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fswfbbox.c;h=70e1ac0b2f27dc09204c4ac164c984b40d7ef552;hb=435afb74a9aedfe10a49f0a181833705c9cbcf82;hp=5fb1dbafd57fb9a400e1b396eabd203757ac6520;hpb=6f3e9add89a0157ef6552bc154475b43b371e615;p=swftools.git diff --git a/src/swfbbox.c b/src/swfbbox.c index 5fb1dba..70e1ac0 100644 --- a/src/swfbbox.c +++ b/src/swfbbox.c @@ -60,7 +60,7 @@ int args_callback_option(char*name,char*val) return 0; } else if(!strcmp(name, "v")) { - verbose = 1; + verbose ++; return 0; } else if(!strcmp(name, "o")) { @@ -103,117 +103,6 @@ int args_callback_command(char*name,char*val) #define swf_ResetReadBits(tag) if (tag->readBit) { tag->pos++; tag->readBit = 0; } -void parseFillStyleArray(TAG*tag, SHAPE2*shape) -{ - U16 count; - int t; - int num=0; - if(tag->id == ST_DEFINESHAPE) - num = 1; - else if(tag->id == ST_DEFINESHAPE2) - num = 2; - else if(tag->id == ST_DEFINESHAPE3) - num = 3; - - count = swf_GetU8(tag); - if(count == 0xff && num>1) // defineshape2,3 only - count = swf_GetU16(tag); - - if(verbose) printf("num: %d\n", count); - shape->numfillstyles = count; - shape->fillstyles = malloc(sizeof(FILLSTYLE)*count); - - for(t=0;tfillstyles[t]; - swf_ResetReadBits(tag); - type = swf_GetU8(tag); //type - shape->fillstyles[t].type = type; - if(type == 0) { - /* plain color */ - if(num == 3) - swf_GetRGBA(tag, &dest->color); - else - swf_GetRGB(tag, &dest->color); - } - else if(type == 0x10 || type == 0x12) - { - /* linear/radial gradient fill */ - swf_ResetReadBits(tag); - swf_GetMatrix(tag, &dest->m); - swf_ResetReadBits(tag); - swf_GetGradient(tag, &dest->gradient, num>=3?1:0); - } - else if(type == 0x40 || type == 0x41) - { - /* bitmap fill */ - swf_ResetReadBits(tag); - dest->id_bitmap = swf_GetU16(tag); //id - swf_ResetReadBits(tag); //? - swf_GetMatrix(tag, &dest->m); - } - else { - fprintf(stderr, "rfxswf:swftools.c Unknown fillstyle:0x%02x\n",type); - } - } - swf_ResetReadBits(tag); - count = swf_GetU8(tag); // line style array - if(count == 0xff) - count = swf_GetU16(tag); - - if(verbose) printf("lnum: %d\n", count); - - shape->numlinestyles = count; - shape->linestyles = malloc(sizeof(LINESTYLE)*count); - /* TODO: should we start with 1 and insert a correct definition of the - "built in" linestyle 0? */ - for(t=0;tlinestyles[t].width = swf_GetU16(tag); - if(num == 3) - swf_GetRGBA(tag, &shape->linestyles[t].color); - else - swf_GetRGB(tag, &shape->linestyles[t].color); - } - return; -} - -void swf_ParseDefineShape(TAG*tag, SHAPE2*shape) -{ - int num = 0, id; - U16 fill,line; - SRECT r; - SRECT r2; - SHAPELINE*l; - if(tag->id == ST_DEFINESHAPE) - num = 1; - else if(tag->id == ST_DEFINESHAPE2) - num = 2; - else if(tag->id == ST_DEFINESHAPE3) - num = 3; - else { - fprintf(stderr, "parseDefineShape must be called with a shape tag"); - } - - id = swf_GetU16(tag); //id - memset(shape, 0, sizeof(SHAPE2)); - shape->bbox = malloc(sizeof(SRECT)); - swf_GetRect(tag, &r); - - memcpy(shape->bbox, &r, sizeof(SRECT)); - parseFillStyleArray(tag, shape); - - swf_ResetReadBits(tag); - fill = (U16)swf_GetBits(tag,4); - line = (U16)swf_GetBits(tag,4); - - shape->lines = swf_ParseShapeData(&tag->data[tag->pos], (tag->len - tag->pos)*8, fill, line); - - l = shape->lines; -} - void swf_Shape2Optimize(SHAPE2*shape) { if(!shape->bbox) @@ -221,73 +110,6 @@ void swf_Shape2Optimize(SHAPE2*shape) *(shape->bbox) = swf_GetShapeBoundingBox(shape); } -void swf_Shape2ToShape(SHAPE2*shape2, SHAPE*shape) -{ - TAG*tag = swf_InsertTag(0,0); - SHAPELINE*l,*next; - int newx=0,newy=0,lastx=0,lasty=0,oldls=0,oldfs0=0,oldfs1=0; - - memset(shape, 0, sizeof(SHAPE)); - - shape->linestyle.n = shape2->numlinestyles; - shape->linestyle.data = (LINESTYLE*)malloc(sizeof(LINESTYLE)*shape->linestyle.n); - memcpy(shape->linestyle.data, shape2->linestyles, sizeof(LINESTYLE)*shape->linestyle.n); - - shape->fillstyle.n = shape2->numfillstyles; - shape->fillstyle.data = (FILLSTYLE*)malloc(sizeof(FILLSTYLE)*shape->fillstyle.n); - memcpy(shape->fillstyle.data, shape2->fillstyles, sizeof(FILLSTYLE)*shape->fillstyle.n); - - swf_ShapeCountBits(shape,NULL,NULL); - - l = shape2->lines; - - while(l) { - int ls=0,fs0=0,fs1=0; - - if(l->type != moveTo) { - if(oldls != l->linestyle) {oldls = ls = l->linestyle;if(!ls) ls=0x8000;} - if(oldfs0 != l->fillstyle0) {oldfs0 = fs0 = l->fillstyle0;if(!fs0) fs0=0x8000;} - if(oldfs1 != l->fillstyle1) {oldfs1 = fs1 = l->fillstyle1;if(!fs1) fs1=0x8000;} - - if(ls || fs0 || fs1 || newx!=0x7fffffff || newy!=0x7fffffff) { - swf_ShapeSetAll(tag,shape,newx,newy,ls,fs0,fs1); - newx = 0x7fffffff; - newy = 0x7fffffff; - } - } - - if(l->type == lineTo) { - swf_ShapeSetLine(tag,shape,l->x-lastx,l->y-lasty); - } else if(l->type == splineTo) { - swf_ShapeSetCurve(tag,shape, l->sx-lastx,l->sy-lasty, l->x-l->sx,l->y-l->sy); - } - if(l->type == moveTo) { - newx = l->x; - newy = l->y; - } - - lastx = l->x; - lasty = l->y; - l = l->next; - } - swf_ShapeSetEnd(tag); - shape->data = tag->data; - shape->bitlen = tag->len*8; -} - -void swf_SetShape2(TAG*tag, SHAPE2*shape2) -{ - SHAPE shape; - swf_Shape2ToShape(shape2, &shape); - - swf_SetRect(tag,shape2->bbox); - swf_SetShapeStyles(tag, &shape); - swf_ShapeCountBits(&shape,NULL,NULL); - swf_SetShapeBits(tag,&shape); - - swf_SetBlock(tag, shape.data, (shape.bitlen+7)/8); -} - /* {char {x1 y1 x2 y2 x3 y3 x4 y4]] */ @@ -335,9 +157,94 @@ MATRIX getmatrix(TAG*tag) return o.matrix; } + +static int fontnum = -1; +static SWFFONT**fonts; +static SWF*c_swf; +static void fontcallback1(U16 id,U8 * name) +{ fontnum++; +} +static void fontcallback2(U16 id,U8 * name) +{ + fonts[fontnum] = 0; + swf_FontExtract(c_swf,id,&fonts[fontnum]); + if(verbose) { + if(fonts[fontnum]) printf("Extracting font %d (%s)\n", id, name); + else printf("Extracting font %d (%s) failed\n", id, name); + fflush(stdout); + } + fontnum++; +} +typedef struct _textbounds +{ + SRECT r; + MATRIX m; // character transform matrix +} textbounds_t; + +static void textcallback(void*self, int*chars, int*xpos, int nr, int fontid, int fontsize, + int xstart, int ystart, RGBA* color) +{ + textbounds_t * bounds = (textbounds_t*)self; + SWFFONT*font = 0; + int t; + for(t=0;tid == fontid) { + font = fonts[t]; + break; + } + } + if(!font) { + fprintf(stderr, "Font %d unknown\n", fontid); + exit(1); + } + if(!font->layout) { + /* This is an expensive operation- but what should we do, we + need the glyph's bounding boxes */ + swf_FontCreateLayout(font); + } + + if(verbose) + printf("%d chars, font %d, size %d, at (%d,%d)\n", nr, fontid, fontsize, xstart, ystart); + + for(t=0;tlayout->bounds[chars[t]]; + MATRIX m = bounds->m; + + if(ch < font->numchars && font->glyph2ascii) { + ch = font->glyph2ascii[ch]; + } + + m.sx = (m.sx * fontsize) / 1024; + m.sy = (m.sy * fontsize) / 1024; + m.r0 = (m.r0 * fontsize) / 1024; + m.r1 = (m.r1 * fontsize) / 1024; + + m.tx += x; + m.ty += y; + newglyphbbox = swf_TurnRect(glyphbbox, &m); + + if(ch<32) ch='?'; + + swf_ExpandRect2(&(bounds->r), &newglyphbbox); + if(verbose >= 2) { + printf("%5d %c, %d %d %d %d (%d %d %d %d) -> %d %d %d %d\n", + xpos[t], ch, + glyphbbox.xmin, glyphbbox.ymin, glyphbbox.xmax, glyphbbox.ymax, + newglyphbbox.xmin, newglyphbbox.ymin, newglyphbbox.xmax, newglyphbbox.ymax, + bounds->r.xmin, bounds->r.ymin, bounds->r.xmax, bounds->r.ymax); + } + + } +} + static void swf_OptimizeBoundingBoxes(SWF*swf) { TAG* tag = swf->firstTag; + while (tag) { if (tag->id == ST_DEFINESHAPE || tag->id == ST_DEFINESHAPE2 || @@ -350,6 +257,56 @@ static void swf_OptimizeBoundingBoxes(SWF*swf) tag->pos = 0; swf_SetShape2(tag, &s); } + if (tag->id == ST_DEFINETEXT || tag->id == ST_DEFINETEXT2) { + SRECT oldbox; + int matrix_offset; + int len; + U8*data; + textbounds_t bounds; + if(verbose) printf("%s\n", swf_TagGetName(tag)); + if(fontnum < 0) { + if(verbose) printf("Extracting fonts...\n"); + c_swf = swf; + fontnum = 0; + swf_FontEnumerate(swf,&fontcallback1); + fonts = (SWFFONT**)malloc(fontnum*sizeof(SWFFONT*)); + memset(fonts, 0, fontnum*sizeof(SWFFONT*)); + fontnum = 0; + swf_FontEnumerate(swf,&fontcallback2); + } + + memset(&bounds, 0, sizeof(bounds)); + + swf_SetTagPos(tag, 0); + swf_GetU16(tag); + swf_GetRect(tag,&oldbox); + swf_ResetReadBits(tag); + matrix_offset = tag->pos; + swf_GetMatrix(tag,&bounds.m); + swf_ParseDefineText(tag, textcallback, &bounds); + if(verbose) { + printf("\n"); + swf_DumpMatrix(stdout, &bounds.m); + printf("old: %d %d %d %d\n", oldbox.xmin, oldbox.ymin, oldbox.xmax, oldbox.ymax); + printf("new: %d %d %d %d\n", bounds.r.xmin, bounds.r.ymin, bounds.r.xmax, bounds.r.ymax); + } + + /* now comes the tricky part: + we have to fiddle the data back in + thank heavens that the bbox is follow by a matrix + struct, which always starts on a byte boundary. + */ + len = tag->len - matrix_offset; + data = malloc(len); + memcpy(data, &tag->data[matrix_offset], len); + tag->writeBit = 0; + tag->len = 2; + swf_SetRect(tag, &bounds.r); + swf_SetBlock(tag, data, len); + free(data); + tag->pos = tag->readBit = 0; + } + tag = tag->next; } }