if page range is given and % filename syntax is used, name files according to page...

[swftools.git] / src / swfstrings.c

diff --git a/src/swfstrings.c b/src/swfstrings.c
index 9e9261d..86d8aed 100644 (file)
--- a/src/swfstrings.c
+++ b/src/swfstrings.c
@@ -62,17 +62,19 @@ int args_callback_command(char*name,char*val)
 
 SWF swf;
   
-void fontcallback(U16 id,U8 * name)
-{ LPSWFFONT font;
-  LPTAG t;
+void fontcallback(void*self,U16 id,U8 * name)
+{ SWFFONT* font;
+  TAG* t;
   
   swf_FontExtract(&swf,id,&font);
-  printf("#< %s %s %s>\n",name,swf_FontIsBold(font)?"bold":"",swf_FontIsItalic(font)?"italic":"");
+  printf("#<font %d \"%s\"%s%s>\n",id, name,swf_FontIsBold(font)?" bold":"",swf_FontIsItalic(font)?" italic":"");
 
   t = swf.firstTag;
 
   while (t)
-  { swf_TextPrintDefineText(t,font);
+  { 
+    if(swf_isTextTag(t))
+       swf_TextPrintDefineText(t,font);
     t = swf_NextTag(t);
   }
   
@@ -94,7 +96,7 @@ int main (int argc,char ** argv)
     }
     else
     { close(f);
-      swf_FontEnumerate(&swf,&fontcallback);
+      swf_FontEnumerate(&swf,&fontcallback,0);
       swf_FreeTags(&swf);
     }
   } else {