X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fmodules%2Fswfdump.c;h=c7bfcea5f8c4a802adce523aa9996d66301b2571;hb=965fb2d8ab551a8544f85bf1ab7441bcd0c7c2c5;hp=d8f80412b8729f6895b8739814559f6a8bdd20fe;hpb=67ec0d8aa1afd03b46019376ac0dbbf9f525e1c6;p=swftools.git

diff --git a/lib/modules/swfdump.c b/lib/modules/swfdump.c
index d8f8041..c7bfcea 100644
--- a/lib/modules/swfdump.c
+++ b/lib/modules/swfdump.c
@@ -32,9 +32,12 @@ void swf_DumpHeader(FILE * f,SWF * swf)
 
 void swf_DumpMatrix(FILE * f,MATRIX * m)
 { if (!f) f = stderr;
-  fprintf(f,"[%08x][%08x]\n",m->sx,m->r1);
+  /*fprintf(f,"[%08x][%08x]\n",m->sx,m->r1);
   fprintf(f,"[%08x][%08x]\n",m->r0,m->sy);
-  fprintf(f," %08x, %08x\n",m->tx,m->ty);
+  fprintf(f," %08x, %08x\n",m->tx,m->ty);*/
+  fprintf(f,"[%08x][%08x] %5.2f %5.2f %5.2f\n",m->sx,m->r1, m->sx/65536.0,m->r1/65536.0, m->tx/20.0);
+  fprintf(f,"[%08x][%08x] %5.2f %5.2f %5.2f\n",m->r0,m->sy, m->r0/65536.0,m->sy/65536.0, m->ty/20.0 );
+  fprintf(f," %08x, %08x \n",m->tx,m->ty);
 }
 
 void swf_DumpTag(FILE * f,TAG * t)
@@ -86,15 +89,15 @@ void swf_DumpShape(SHAPE2*shape2)
     while(l) {
 	if(l->type == moveTo) {
 	    //printf("fill %d/%d line %d\n", l->fillstyle0, l->fillstyle1, l->linestyle);
-	    printf("moveTo %.2f,%.2f\n", l->x/20.0, l->y/20.0);
+	    printf("moveTo %.2f,%.2f (fill0:%d fill1:%d line:%d)\n", l->x/20.0, l->y/20.0, l->fillstyle0, l->fillstyle1, l->linestyle);
 	}
 	if(l->type == lineTo) {
 	    //printf("fill %d/%d line %d\n", l->fillstyle0,  l->fillstyle1, l->linestyle);
-	    printf("lineTo %.2f,%.2f\n", l->x/20.0, l->y/20.0);
+	    printf("lineTo %.2f,%.2f (fill0:%d fill1:%d line:%d)\n", l->x/20.0, l->y/20.0, l->fillstyle0, l->fillstyle1, l->linestyle);
 	}
 	if(l->type == splineTo) {
 	    //printf("fill %d/%d line %d\n", l->fillstyle0, l->fillstyle1, l->linestyle);
-	    printf("splineTo %.2f,%.2f %.2f,%.2f\n", l->sx/20.0, l->sy/20.0, l->x/20.0, l->y/20.0);
+	    printf("splineTo %.2f,%.2f %.2f,%.2f (fill0:%d fill1:%d line:%d)\n", l->sx/20.0, l->sy/20.0, l->x/20.0, l->y/20.0, l->fillstyle0, l->fillstyle1, l->linestyle);
 	}
 	l = l->next;
     }
@@ -206,6 +209,20 @@ char* swf_TagGetName(TAG*tag)
             return "VIDEOFRAME";
         case ST_DEFINEFONTINFO2:
             return "DEFINEFONTINFO2";
+        case ST_FILEATTRIBUTES:
+            return "FILEATTRIBUTES";
+        case ST_IMPORTASSETS2:
+            return "IMPORTASSETS2";
+        case ST_DEFINESCALINGGRID:
+            return "DEFINESCALINGGRID";
+        case ST_DEFINESHAPE4:
+            return "DEFINESHAPE4";
+        case ST_DEFINEFONT3:
+            return "DEFINEFONT3";
+        case ST_DEFINEFONTALIGNZONES:
+            return "DEFINEFONTALIGNZONES";
+        case ST_CSMTEXTSETTINGS:
+            return "CSMTEXTSETTINGS";
         case ST_FREEALL:
             return "FREEALL";
         case ST_MX4: