X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fswfdump.c;h=5da07fc327db5e109d639462156dcc2e24461fd0;hb=3a83195a8df859d847300bd1bf0e03a7354ded79;hp=be2a3ddf62a75f318115f7c8a71669939a65676a;hpb=a0ff27ead3e29bbc9f44f2e34a8f90718b3a1cc2;p=swftools.git

diff --git a/src/swfdump.c b/src/swfdump.c
index be2a3dd..5da07fc 100644
--- a/src/swfdump.c
+++ b/src/swfdump.c
@@ -58,6 +58,7 @@ static int showshapes = 0;
 static int hex = 0;
 static int used = 0;
 static int bbox = 0;
+static int cumulative = 0;
 
 static struct options_t options[] = {
 {"h", "help"},
@@ -105,6 +106,10 @@ int args_callback_option(char*name,char*val)
         html = 1;
         return 0;
     }
+    else if(name[0]=='c') {
+        cumulative = 1;
+        return 0;
+    }
     else if(name[0]=='E') {
         html = 1;
         xhtml = 1;
@@ -270,8 +275,12 @@ void textcallback(void*self, int*glyphs, int*ypos, int nr, int fontid, int fonts
 	    if(glyphs[t] >= fonts[font]->numchars  /*glyph is in range*/
 		    || !fonts[font]->glyph2ascii /* font has ascii<->glyph mapping */
 	      ) a = glyphs[t];
-	    else
-		a = fonts[font]->glyph2ascii[glyphs[t]];
+	    else {
+		if(fonts[font]->glyph2ascii[glyphs[t]])
+		    a = fonts[font]->glyph2ascii[glyphs[t]];
+		else
+		    a = glyphs[t];
+	    }
 	} else {
 	    a = glyphs[t];
 	}
@@ -761,6 +770,7 @@ int main (int argc,char ** argv)
     char* framelabel = 0;
     char prefix[128];
     int filesize = 0;
+    int filepos = 0;
     prefix[0] = 0;
     memset(idtab,0,65536);
 
@@ -904,10 +914,14 @@ int main (int argc,char ** argv)
             //tag = tag->next;
             //continue;
         }
-	if(swf_TagGetName(tag)) {
-	    printf("[%03x] %9ld %s%s", tag->id, tag->len, prefix, swf_TagGetName(tag));
+	if(!name) {
+	    name = "UNKNOWN TAG";
+	}
+	if(cumulative) {
+	    filepos += tag->len;
+	    printf("[%03x] %9ld %9ld %s%s", tag->id, tag->len, filepos, prefix, swf_TagGetName(tag));
 	} else {
-	    printf("[%03x] %9ld %sUNKNOWN TAG %03x", tag->id, tag->len, prefix, tag->id);
+	    printf("[%03x] %9ld %s%s", tag->id, tag->len, prefix, swf_TagGetName(tag));
 	}
 	
 	if(tag->id == ST_FREECHARACTER) {