fixed font tables.

[swftools.git] / lib / example / dumpfont.c

diff --git a/lib/example/dumpfont.c b/lib/example/dumpfont.c
index 0011937..02e109b 100644 (file)
--- a/lib/example/dumpfont.c
+++ b/lib/example/dumpfont.c
@@ -9,8 +9,6 @@
    external files.
 
    Usage: ./dumpfont filename.swf > myfont.c
-
-   Limits: does not parse ST_DEFINEFONT2 
    
    Part of the swftools package.
 
@@ -71,19 +69,19 @@ void DumpFont(SWFFONT * f,char * name)
   printf("  f->ascii2glyph = (int*)malloc(sizeof(int)*%d);\n",f->maxascii);
   printf("  memset(f->ascii2glyph, -1, sizeof(int)*%d);\n\n", f->maxascii);
   if(f->layout) {
-      printf("  f->layout = (SWFLAYOUT*)malloc(sizeof(SWFLAYOUT));");
-      printf("  f->layout->ascent = %d;", f->layout->ascent);
-      printf("  f->layout->descent = %d;", f->layout->descent);
-      printf("  f->layout->leading = %d;", f->layout->leading);
-      printf("  f->layout->kerningcount = 0;");
-      printf("  f->layout->kerning = 0;");
-      printf("  f->layout->bounds = (SRECT*)malloc(sizeof(SRECT)*%d);", f->numchars);
-      printf("  memset(f->layout->bounds, 0, malloc(sizeof(SRECT)*%d));", f->numchars);
+      printf("  f->layout = (SWFLAYOUT*)malloc(sizeof(SWFLAYOUT));\n");
+      printf("  f->layout->ascent = %d;\n", f->layout->ascent);
+      printf("  f->layout->descent = %d;\n", f->layout->descent);
+      printf("  f->layout->leading = %d;\n", f->layout->leading);
+      printf("  f->layout->kerningcount = 0;\n");
+      printf("  f->layout->kerning = 0;\n");
+      printf("  f->layout->bounds = (SRECT*)malloc(sizeof(SRECT)*%d);\n", f->numchars);
+      printf("  memset(f->layout->bounds, 0, sizeof(SRECT)*%d);\n\n", f->numchars);
   }
 
   for (i=0;i<f->numchars;i++)
     if (f->glyph[i].shape)
-    { printf("  addGlyph(f,%3i, 0x%02x,%4i, &Glyphs_%s[0x%04x],%4i); // %c\n",
+    { printf("  addGlyph(f,%3i, 0x%03x,%4i, &Glyphs_%s[0x%04x],%4i); // %c\n",
              i, f->glyph2ascii[i], f->glyph[i].advance, name, gpos[i],
              f->glyph[i].shape->bitlen,PRINTABLE(f->glyph2ascii[i]));
     }