X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fmodules%2Fswftext.c;h=8a04b38192bb02ec9adad5f8a8a079f32abea6b1;hb=d5c725f9d078dd9103bf35286abe767646ab81aa;hp=30e877fddc7b166ecf514b81b1f9f65c3a760ab8;hpb=a96acf64e3570fd1ef0c91d9883d1238398b1b38;p=swftools.git

diff --git a/lib/modules/swftext.c b/lib/modules/swftext.c
index 30e877f..8a04b38 100644
--- a/lib/modules/swftext.c
+++ b/lib/modules/swftext.c
@@ -378,6 +378,7 @@ int swf_FontExtract(SWF * swf,int id,SWFFONT * * font)
         break;
         
       case ST_DEFINEFONTINFO:
+      case ST_DEFINEFONTINFO2:
         nid = swf_FontExtract_DefineFontInfo(id,f,t);
         break;
         
@@ -684,7 +685,7 @@ int swf_TextCountBits(SWFFONT * font,U8 * s,int scale,U8 * gbits,U8 * abits)
     if(s[0] < font->maxascii)
 	glyph = font->ascii2glyph[s[0]];
     if(glyph>=0) {
-       g = swf_CountBits(glyph,g);
+       g = swf_CountUBits(glyph,g);
        a = swf_CountBits((((U32)font->glyph[glyph].advance)*scale)/100,a);
     }
     s++;
@@ -1015,7 +1016,7 @@ void swf_FontCreateLayout(SWFFONT*f)
 	if(!shape2) { 
 	    fprintf(stderr, "Shape parse error\n");exit(1);
 	}
-	bbox = swf_GetShapeBoundingBox(shape2->lines);
+	bbox = swf_GetShapeBoundingBox(shape2);
 	swf_Shape2Free(shape2);
 	f->layout->bounds[t] = bbox;
 	/* FIXME */