X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fswfdump.c;h=c9ca3954b9d7f11e8e5a8252303c759d6aef87e2;hb=427ac5a71a17b9df0bd2d9893fa29fc98b8019e6;hp=7f020b6b9fc2b4957d2f31294476dfc56f2b5936;hpb=bcefc056ecefadd07b83500d8313dad21c25e126;p=swftools.git

diff --git a/src/swfdump.c b/src/swfdump.c
index 7f020b6..c9ca395 100644
--- a/src/swfdump.c
+++ b/src/swfdump.c
@@ -59,6 +59,7 @@ static int hex = 0;
 static int used = 0;
 static int bbox = 0;
 static int cumulative = 0;
+static int showfonts = 0;
 
 static struct options_t options[] = {
 {"h", "help"},
@@ -131,6 +132,10 @@ int args_callback_option(char*name,char*val)
 	xy |= 8;
 	return 0;
     }
+    else if(name[0]=='F') {
+	showfonts = 1;
+	return 0;
+    }
     else if(name[0]=='d') {
 	hex = 1;
 	return 0;
@@ -253,6 +258,57 @@ void dumpButtonActions(TAG*tag, char*prefix)
     swf_DumpActions(actions, prefix);
 }
 
+void dumpFont(TAG*tag, char*prefix)
+{
+    SWFFONT* font = malloc(sizeof(SWFFONT));
+    memset(font, 0, sizeof(SWFFONT));
+    if(tag->id == ST_DEFINEFONT2) {
+	swf_FontExtract_DefineFont2(0, font, tag);
+    } else if(tag->id == ST_DEFINEFONT) {
+	swf_FontExtract_DefineFont(0, font, tag);
+    } else {
+	printf("%sCan't parse %s yet\n", prefix,swf_TagGetName(tag));
+    }
+    printf("%sID: %d\n", prefix,font->id);
+    printf("%sVersion: %d\n", prefix,font->version);
+    printf("%sname: %s\n", prefix,font->name);
+    printf("%scharacters: %d\n", prefix,font->numchars);
+    printf("%shightest mapped unicode value: %d\n", prefix,font->maxascii);
+    if(font->layout)
+    {
+	printf("%sascent:%.2f\n", prefix,font->layout->ascent / 20.0);
+	printf("%sdescent:%.2f\n", prefix,font->layout->descent / 20.0);
+	printf("%sleading:%.2f\n", prefix,font->layout->leading / 20.0);
+	printf("%skerning records:%d\n", prefix,font->layout->kerningcount);
+    }
+    printf("%sstyle: %d\n", prefix,font->style);
+    printf("%sencoding: %02x\n", prefix,font->encoding);
+    printf("%slanguage: %02x\n", prefix,font->language);
+    int t;
+    for(t=0;t<font->numchars;t++) {
+	printf("%s== Glyph %d: advance=%d ==\n", prefix, t, font->glyph[t].advance);
+	SHAPE2* shape = swf_ShapeToShape2(font->glyph[t].shape);
+	SHAPELINE*line = shape->lines;
+
+	while(line) {
+	    if(line->type == moveTo) {
+		printf("%smoveTo %.2f %.2f\n", prefix, line->x/20.0, line->y/20.0);
+	    } else if(line->type == lineTo) {
+		printf("%slineTo %.2f %.2f\n", prefix, line->x/20.0, line->y/20.0);
+	    } else if(line->type == splineTo) {
+		printf("%ssplineTo (%.2f %.2f) %.2f %.2f\n", prefix,
+			line->sx/20.0, line->sy/20.0,
+			line->x/20.0, line->y/20.0
+			);
+	    }
+	    line = line->next;
+	}
+	swf_Shape2Free(shape);
+	free(shape);
+    }
+    swf_FontFree(font);
+}
+
 SWF swf;
 int fontnum = 0;
 SWFFONT**fonts;
@@ -1039,7 +1095,7 @@ int main (int argc,char ** argv)
 
             printf(" at depth %04d", swf_GetDepth(tag));
 
-	    if(tag->data[1]&4)
+	    if(tag->id == ST_PLACEOBJECT3 && tag->data[1]&4)
 		printf(" as bitmap");
 	   
 	    swf_SetTagPos(tag, 0);
@@ -1135,6 +1191,26 @@ int main (int argc,char ** argv)
 		printf("\n");
 	    }
 	}
+	else if(tag->id == ST_CSMTEXTSETTINGS) {
+	    U16 id = swf_GetU16(tag);
+	    U8 flags = swf_GetU8(tag);
+	    printf(" (");
+	    if(flags&0x40) {
+		printf("flashtype,");
+	    }
+	    switch(((flags>>3)&7)) {
+		case 0:printf("no grid,");break;
+		case 1:printf("pixel grid,");break;
+		case 2:printf("subpixel grid,");break;
+		case 3:printf("unknown grid,");break;
+	    }
+	    if(flags&0x87) 
+		printf("unknown[%08x],", flags);
+	    float thickness = swf_GetFixed(tag);
+	    float sharpness = swf_GetFixed(tag);
+	    printf("s=%.2f,t=%.2f)\n", thickness, sharpness);
+	    swf_GetU8(tag);
+	}
 	else if(tag->id == ST_DEFINEBITSLOSSLESS ||
 	   tag->id == ST_DEFINEBITSLOSSLESS2) {
 	    handleDefineBits(tag);
@@ -1221,6 +1297,9 @@ int main (int argc,char ** argv)
 	else if(tag->id == ST_DEFINEBUTTON && action) {
 	    dumpButtonActions(tag, myprefix);
 	}
+	else if(swf_isFontTag(tag) && showfonts) {
+	    dumpFont(tag, myprefix);
+	}
 	else if(tag->id == ST_DEFINEBUTTON2 && action) {
 	    dumpButton2Actions(tag, myprefix);
 	}
@@ -1232,7 +1311,8 @@ int main (int argc,char ** argv)
 	}
 	else if(tag->id == ST_DEFINESHAPE ||
 		tag->id == ST_DEFINESHAPE2 ||
-		tag->id == ST_DEFINESHAPE3) {
+		tag->id == ST_DEFINESHAPE3 ||
+		tag->id == ST_DEFINESHAPE4) {
 	    if(showshapes)
 		handleShape(tag, myprefix);
 	}