X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fmodules%2Fswftext.c;h=6bd59f0522dec352b663463736aa333d237e2b8d;hb=1233dfe1f22d9f14584e3811d480a97c6a89d4ff;hp=dcea6beb2226d5244d3969faf3b086ef33c27425;hpb=32bce7795076522c72a9c7f5720a6774f5f8223c;p=swftools.git

diff --git a/lib/modules/swftext.c b/lib/modules/swftext.c
index dcea6be..6bd59f0 100644
--- a/lib/modules/swftext.c
+++ b/lib/modules/swftext.c
@@ -253,7 +253,7 @@ int swf_FontExtract_DefineFont2(int id, SWFFONT * font, TAG * tag)
     int fid;
     U32 offset_start;
     U32 *offset;
-    U8 flags1, flags2, namelen;
+    U8 flags1, langcode, namelen;
     swf_SetTagPos(tag, 0);
     font->version = 2;
     fid = swf_GetU16(tag);
@@ -261,7 +261,7 @@ int swf_FontExtract_DefineFont2(int id, SWFFONT * font, TAG * tag)
 	return id;
     font->id = fid;
     flags1 = swf_GetU8(tag);
-    flags2 = swf_GetU8(tag);	//reserved flags
+    langcode = swf_GetU8(tag);	//reserved flags
 
     if (flags1 & 1)
 	font->style |= FONT_STYLE_BOLD;
@@ -310,14 +310,15 @@ int swf_FontExtract_DefineFont2(int id, SWFFONT * font, TAG * tag)
 	swf_GetSimpleShape(tag, &(font->glyph[t].shape));
     }
 
-    swf_SetTagPos(tag, offset[glyphcount]+offset_start);
+    if(glyphcount)
+        swf_SetTagPos(tag, offset[glyphcount]+offset_start);
 
     free(offset);
 
     maxcode = 0;
     for (t = 0; t < glyphcount; t++) {
 	int code;
-	if (flags1 & 4)		// wide codes
+	if (flags1 & 4)		// wide codes (always on for definefont3)
 	    code = swf_GetU16(tag);
 	else
 	    code = swf_GetU8(tag);
@@ -497,6 +498,7 @@ int swf_FontExtract(SWF * swf, int id, SWFFONT * *font)
 	    break;
 
 	case ST_DEFINEFONT2:
+	case ST_DEFINEFONT3:
 	    nid = swf_FontExtract_DefineFont2(id, f, t);
 	    break;
 
@@ -1324,7 +1326,7 @@ SRECT swf_TextCalculateBBoxUTF8(SWFFONT * font, U8 * s, int scale)
 }
 
 
-SWFFONT *swf_ReadFont(char *filename)
+SWFFONT *swf_ReadFont(const char *filename)
 {
     int f;
     SWF swf;
@@ -1364,7 +1366,7 @@ void swf_WriteFont(SWFFONT * font, char *filename)
 
     memset(&swf, 0x00, sizeof(SWF));
 
-    swf.fileVersion = 4;
+    swf.fileVersion = 9;
     swf.frameRate = 0x4000;
 
     /* if we use DefineFont1 to store the characters,
@@ -1389,6 +1391,17 @@ void swf_WriteFont(SWFFONT * font, char *filename)
 	t = swf_InsertTag(t, ST_DEFINEFONT2);
 	swf_FontSetDefine2(t, font);
     }
+    if(font->name) {
+	t = swf_InsertTag(t, ST_NAMECHARACTER);
+        swf_SetU16(t, WRITEFONTID);
+        swf_SetString(t, (char*)font->name);
+	t = swf_InsertTag(t, ST_EXPORTASSETS);
+        swf_SetU16(t, 1);
+        swf_SetU16(t, WRITEFONTID);
+        swf_SetString(t, (char*)font->name);
+
+        t = swf_AddAS3FontDefine(t, WRITEFONTID, (char*)font->name);
+    }
 
     if (storeGlyphNames && font->glyphnames) {
 	int c;
@@ -1397,9 +1410,9 @@ void swf_WriteFont(SWFFONT * font, char *filename)
 	swf_SetU16(t, font->numchars);
 	for (c = 0; c < font->numchars; c++) {
 	    if (font->glyphnames[c])
-		swf_SetString(t, (U8*)font->glyphnames[c]);
+		swf_SetString(t, font->glyphnames[c]);
 	    else
-		swf_SetString(t, (U8*)"");
+		swf_SetString(t, "");
 	}
     }
 
@@ -1512,7 +1525,7 @@ void swf_WriteFont(SWFFONT * font, char *filename)
 }
 
 
-void swf_SetEditText(TAG * tag, U16 flags, SRECT r, char *text, RGBA * color, int maxlength, U16 font, U16 height, EditTextLayout * layout, char *variable)
+void swf_SetEditText(TAG * tag, U16 flags, SRECT r, const char *text, RGBA * color, int maxlength, U16 font, U16 height, EditTextLayout * layout, const char *variable)
 {
     swf_SetRect(tag, &r);
     swf_ResetWriteBits(tag);
@@ -1548,12 +1561,12 @@ void swf_SetEditText(TAG * tag, U16 flags, SRECT r, char *text, RGBA * color, in
 	swf_SetU16(tag, layout->indent);	//indent
 	swf_SetU16(tag, layout->leading);	//leading
     }
-    swf_SetString(tag, (U8*)variable);
+    swf_SetString(tag, variable);
     if (flags & ET_HASTEXT)
-	swf_SetString(tag, (U8*)text);
+	swf_SetString(tag, text);
 }
 
-SRECT swf_SetDefineText(TAG * tag, SWFFONT * font, RGBA * rgb, char *text, int scale)
+SRECT swf_SetDefineText(TAG * tag, SWFFONT * font, RGBA * rgb, const char *text, int scale)
 {
     SRECT r;
     U8 gbits, abits;
@@ -1676,7 +1689,7 @@ void swf_FontCreateLayout(SWFFONT * f)
     }
 }
 
-void swf_DrawText(drawer_t * draw, SWFFONT * font, int size, char *text)
+void swf_DrawText(drawer_t * draw, SWFFONT * font, int size, const char *text)
 {
     U8 *s = (U8 *) text;
     int advance = 0;