X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fmodules%2Fswftext.c;h=54e49bfe57750d8b91e49a1f1e8cb7d0e6d528b0;hb=20718c7dff30c7a676dae1088c2f61b93a53a4c8;hp=c4b162f96d75c99df8493ca76575121b882b597c;hpb=8bde8a660e6eb865d40511c6650ce9f69bb87ed7;p=swftools.git

diff --git a/lib/modules/swftext.c b/lib/modules/swftext.c
index c4b162f..54e49bf 100644
--- a/lib/modules/swftext.c
+++ b/lib/modules/swftext.c
@@ -101,7 +101,7 @@ int swf_FontIsBold(SWFFONT * f)
 
 static const int WRITEFONTID = 0x4e46;	// font id for WriteFont and ReadFont
 
-int swf_FontEnumerate(SWF * swf, void (*FontCallback) (U16, U8 *))
+int swf_FontEnumerate(SWF * swf, void (*FontCallback) (void*, U16, U8 *), void*self)
 {
     int n;
     TAG *t;
@@ -129,7 +129,7 @@ int swf_FontEnumerate(SWF * swf, void (*FontCallback) (U16, U8 *))
 		    s[l] = 0;
 		}
 
-		(FontCallback) (id, s);
+		(FontCallback) (self, id, s);
 
 		swf_RestoreTagPos(t);
 	    }
@@ -157,8 +157,7 @@ int swf_FontExtract_DefineFont(int id, SWFFONT * f, TAG * t)
 	of = swf_GetU16(t);
 	n = of / 2;
 	f->numchars = n;
-	f->glyph = malloc(sizeof(SWFGLYPH) * n);
-	memset(f->glyph, 0, sizeof(SWFGLYPH) * n);
+	f->glyph = rfx_calloc(sizeof(SWFGLYPH) * n);
 
 	for (i = 1; i < n; i++)
 	    swf_GetU16(t);
@@ -191,9 +190,9 @@ int swf_FontExtract_DefineFontInfo(int id, SWFFONT * f, TAG * t)
 	}
 
 	if (f->name)
-	    free(f->name);
+	    rfx_free(f->name);
 
-	f->name = (U8 *) malloc(l + 1);
+	f->name = (U8 *) rfx_alloc(l + 1);
 	swf_GetBlock(t, f->name, l);
 	f->name[l] = 0;
 
@@ -213,7 +212,7 @@ int swf_FontExtract_DefineFontInfo(int id, SWFFONT * f, TAG * t)
 	    f->language = swf_GetU8(t);
 	}
 
-	f->glyph2ascii = (U16 *) malloc(sizeof(U16) * f->numchars);
+	f->glyph2ascii = (U16 *) rfx_alloc(sizeof(U16) * f->numchars);
 	maxcode = 0;
 	for (i = 0; i < f->numchars; i++) {
 	    f->glyph2ascii[i] = ((flags & FF_WIDECODES) ? swf_GetU16(t) : swf_GetU8(t));
@@ -224,7 +223,7 @@ int swf_FontExtract_DefineFontInfo(int id, SWFFONT * f, TAG * t)
 	if (maxcode < 256)
 	    maxcode = 256;
 	f->maxascii = maxcode;
-	f->ascii2glyph = (int *) malloc(sizeof(int) * maxcode);
+	f->ascii2glyph = (int *) rfx_alloc(sizeof(int) * maxcode);
 	memset(f->ascii2glyph, -1, sizeof(int) * maxcode);
 
 	for (i = 0; i < f->numchars; i++)
@@ -248,7 +247,7 @@ int swf_FontExtract_GlyphNames(int id, SWFFONT * f, TAG * tag)
     if (fid == id) {
 	int num = swf_GetU16(tag);
 	int t;
-	f->glyphnames = malloc(sizeof(char *) * num);
+	f->glyphnames = rfx_alloc(sizeof(char *) * num);
 	for (t = 0; t < num; t++) {
 	    f->glyphnames[t] = strdup(swf_GetString(tag));
 	}
@@ -264,6 +263,8 @@ int swf_FontExtract_DefineFont2(int id, SWFFONT * font, TAG * tag)
     int t, glyphcount;
     int maxcode;
     int fid;
+    U32 offset_start;
+    U32 *offset;
     U8 flags1, flags2, namelen;
     swf_SaveTagPos(tag);
     swf_SetTagPos(tag, 0);
@@ -287,35 +288,44 @@ int swf_FontExtract_DefineFont2(int id, SWFFONT * font, TAG * tag)
 	font->encoding |= FONT_ENCODING_SHIFTJIS;
 
     namelen = swf_GetU8(tag);
-    font->name = (U8 *) malloc(namelen + 1);
+    font->name = (U8 *) rfx_alloc(namelen + 1);
     font->name[namelen] = 0;
     swf_GetBlock(tag, font->name, namelen);
     font->version = 2;
     glyphcount = swf_GetU16(tag);
     font->numchars = glyphcount;
 
-    font->glyph = (SWFGLYPH *) malloc(sizeof(SWFGLYPH) * glyphcount);
-    memset(font->glyph, 0, sizeof(SWFGLYPH) * glyphcount);
-    font->glyph2ascii = (U16 *) malloc(sizeof(U16) * glyphcount);
-    memset(font->glyph2ascii, 0, sizeof(U16) * glyphcount);
+    font->glyph = (SWFGLYPH *) rfx_calloc(sizeof(SWFGLYPH) * glyphcount);
+    font->glyph2ascii = (U16 *) rfx_calloc(sizeof(U16) * glyphcount);
+
+    offset = rfx_calloc(sizeof(U32)*(glyphcount+1));
+    offset_start = tag->pos;
 
     if (flags1 & 8) {		// wide offsets
 	for (t = 0; t < glyphcount; t++)
-	    swf_GetU32(tag);	//offset[t]
+	    offset[t] = swf_GetU32(tag);	//offset[t]
 
 	if (glyphcount)		/* this _if_ is not in the specs */
-	    swf_GetU32(tag);	// fontcodeoffset
+	    offset[glyphcount] = swf_GetU32(tag);	// fontcodeoffset
+	else
+	    offset[glyphcount] = tag->pos;
     } else {
 	for (t = 0; t < glyphcount; t++)
-	    swf_GetU16(tag);	//offset[t]
+	    offset[t] = swf_GetU16(tag);	//offset[t]
 
 	if (glyphcount)		/* this _if_ is not in the specs */
-	    swf_GetU16(tag);	// fontcodeoffset
+	    offset[glyphcount] = swf_GetU16(tag);	// fontcodeoffset
+	else
+	    offset[glyphcount] = tag->pos;
     }
-    /* TODO: we should use the offset positions, not just
-             blindly read in shapes */
-    for (t = 0; t < glyphcount; t++)
+    for (t = 0; t < glyphcount; t++) {
+	swf_SetTagPos(tag, offset[t]+offset_start);
 	swf_GetSimpleShape(tag, &(font->glyph[t].shape));
+    }
+
+    swf_SetTagPos(tag, offset[glyphcount]+offset_start);
+
+    free(offset);
 
     maxcode = 0;
     for (t = 0; t < glyphcount; t++) {
@@ -332,7 +342,7 @@ int swf_FontExtract_DefineFont2(int id, SWFFONT * font, TAG * tag)
     if (maxcode < 256)
 	maxcode = 256;
     font->maxascii = maxcode;
-    font->ascii2glyph = (int *) malloc(sizeof(int) * maxcode);
+    font->ascii2glyph = (int *) rfx_alloc(sizeof(int) * maxcode);
     memset(font->ascii2glyph, -1, sizeof(int) * maxcode);
     for (t = 0; t < glyphcount; t++) {
 	font->ascii2glyph[font->glyph2ascii[t]] = t;
@@ -340,7 +350,7 @@ int swf_FontExtract_DefineFont2(int id, SWFFONT * font, TAG * tag)
 
     if (flags1 & 128) {		// has layout
 	U16 kerningcount;
-	font->layout = (SWFLAYOUT *) malloc(sizeof(SWFLAYOUT));
+	font->layout = (SWFLAYOUT *) rfx_alloc(sizeof(SWFLAYOUT));
 	font->layout->ascent = swf_GetU16(tag);
 	font->layout->descent = swf_GetU16(tag);
 	font->layout->leading = swf_GetU16(tag);
@@ -348,7 +358,7 @@ int swf_FontExtract_DefineFont2(int id, SWFFONT * font, TAG * tag)
 	    S16 advance = swf_GetS16(tag);
 	    font->glyph[t].advance = advance;
 	}
-	font->layout->bounds = malloc(glyphcount * sizeof(SRECT));
+	font->layout->bounds = rfx_alloc(glyphcount * sizeof(SRECT));
 	for (t = 0; t < glyphcount; t++) {
 	    swf_ResetReadBits(tag);
 	    swf_GetRect(tag, &font->layout->bounds[t]);
@@ -357,9 +367,9 @@ int swf_FontExtract_DefineFont2(int id, SWFFONT * font, TAG * tag)
 	kerningcount = swf_GetU16(tag);
 	font->layout->kerningcount = kerningcount;
 
-	font->layout->kerning = (SWFKERNING *) malloc(sizeof(SWFKERNING) * kerningcount);
+	font->layout->kerning = (SWFKERNING *) rfx_alloc(sizeof(SWFKERNING) * kerningcount);
 	if (kerningcount) {
-	    font->layout->kerning = malloc(sizeof(*font->layout->kerning) * kerningcount);
+	    font->layout->kerning = rfx_alloc(sizeof(*font->layout->kerning) * kerningcount);
 	    for (t = 0; t < kerningcount; t++) {
 		if (flags1 & 4) {	// wide codes
 		    font->layout->kerning[t].char1 = swf_GetU16(tag);
@@ -384,7 +394,7 @@ int swf_FontExtract_DefineFont2(int id, SWFFONT * font, TAG * tag)
 static int
 swf_FontExtract_DefineTextCallback(int id, SWFFONT * f, TAG * t, int jobs,
 				   void (*callback) (void *self,
-						     int *chars, int *ypos, int nr, int fontid, int fontsize, int xstart, int ystart, RGBA * color), void *self)
+						     int *chars, int *xpos, int nr, int fontid, int fontsize, int xstart, int ystart, RGBA * color), void *self)
 {
     U16 cid;
     SRECT r;
@@ -495,8 +505,7 @@ int swf_FontExtract(SWF * swf, int id, SWFFONT * *font)
     if ((!swf) || (!font))
 	return -1;
 
-    f = (SWFFONT *) malloc(sizeof(SWFFONT));
-    memset(f, 0x00, sizeof(SWFFONT));
+    f = (SWFFONT *) rfx_calloc(sizeof(SWFFONT));
 
     t = swf->firstTag;
 
@@ -530,7 +539,7 @@ int swf_FontExtract(SWF * swf, int id, SWFFONT * *font)
 	t = swf_NextTag(t);
     }
     if (f->id != id) {
-	free(f);
+	rfx_free(f);
 	f = 0;
     }
     font[0] = f;
@@ -549,13 +558,13 @@ void swf_LayoutFree(SWFLAYOUT * l)
 {
     if (l) {
 	if (l->kerning)
-	    free(l->kerning);
+	    rfx_free(l->kerning);
 	l->kerning = NULL;
 	if (l->bounds)
-	    free(l->bounds);
+	    rfx_free(l->bounds);
 	l->bounds = NULL;
     }
-    free(l);
+    rfx_free(l);
 }
 
 
@@ -565,9 +574,9 @@ static void font_freeglyphnames(SWFFONT*f)
 	int t;
 	for (t = 0; t < f->numchars; t++) {
 	    if (f->glyphnames[t])
-		free(f->glyphnames[t]);
+		rfx_free(f->glyphnames[t]);
 	}
-	free(f->glyphnames);
+	rfx_free(f->glyphnames);
 	f->glyphnames = 0;
     }
 
@@ -576,9 +585,9 @@ static void font_freeusage(SWFFONT*f)
 {
     if (f->use) {
 	if(f->use->chars) {
-	    free(f->use->chars);f->use->chars = 0;
+	    rfx_free(f->use->chars);f->use->chars = 0;
 	}
-	free(f->use); f->use = 0;
+	rfx_free(f->use); f->use = 0;
     }
 }
 static void font_freelayout(SWFFONT*f)
@@ -591,12 +600,12 @@ static void font_freelayout(SWFFONT*f)
 static void font_freename(SWFFONT*f)
 {
     if (f->name) {
-	free(f->name);
+	rfx_free(f->name);
 	f->name = 0;
     }
 }
 
-int swf_FontReduce(SWFFONT * f)
+int swf_FontReduce_old(SWFFONT * f)
 {
     int i, j;
     int max_unicode = 0;
@@ -639,6 +648,41 @@ int swf_FontReduce(SWFFONT * f)
     return j;
 }
 
+int swf_FontReduce(SWFFONT * f)
+{
+    int i;
+    int max_unicode = 0;
+    int max_glyph = 0;
+    if ((!f) || (!f->use) || f->use->is_reduced)
+	return -1;
+
+    for (i = 0; i < f->numchars; i++) {
+	if(!f->use->chars[i]) {
+	    f->glyph2ascii[i] = 0;
+	    if(f->glyph[i].shape) {
+		swf_ShapeFree(f->glyph[i].shape);
+		f->glyph[i].shape = 0;
+		f->glyph[i].advance = 0;
+	    }
+	} else {
+	    max_glyph = i+1;
+	}
+    }
+    for (i = 0; i < f->maxascii; i++) {
+	if(!f->use->chars[f->ascii2glyph[i]]) {
+	    f->ascii2glyph[i] = -1;
+	} else {
+	    max_unicode = i+1;
+	}
+    }
+    f->maxascii = max_unicode;
+    f->numchars = max_glyph;
+    font_freelayout(f);
+    font_freeglyphnames(f);
+    font_freename(f);
+    return 0;
+}
+
 void swf_FontSort(SWFFONT * font)
 {
     int i, j, k;
@@ -647,7 +691,7 @@ void swf_FontSort(SWFFONT * font)
     if (!font)
 	return;
     
-    newplace = malloc(sizeof(int) * font->numchars);
+    newplace = rfx_alloc(sizeof(int) * font->numchars);
 
     for (i = 0; i < font->numchars; i++) {
 	newplace[i] = i;
@@ -685,7 +729,7 @@ void swf_FontSort(SWFFONT * font)
 		}
 	    }
 	}
-    newpos = malloc(sizeof(int) * font->numchars);
+    newpos = rfx_alloc(sizeof(int) * font->numchars);
     for (i = 0; i < font->numchars; i++) {
 	newpos[newplace[i]] = i;
     }
@@ -694,8 +738,8 @@ void swf_FontSort(SWFFONT * font)
 	    font->ascii2glyph[i] = newpos[font->ascii2glyph[i]];
     }
 
-    free(newpos);
-    free(newplace);
+    rfx_free(newpos);
+    rfx_free(newplace);
 }
 
 void swf_FontPrepareForEditText(SWFFONT * font)
@@ -713,10 +757,9 @@ int swf_FontInitUsage(SWFFONT * f)
 	fprintf(stderr, "Usage initialized twice");
 	return -1;
     }
-    f->use = malloc(sizeof(FONTUSAGE));
+    f->use = rfx_alloc(sizeof(FONTUSAGE));
     f->use->is_reduced = 0;
-    f->use->chars = malloc(sizeof(f->use->chars[0]) * f->numchars);
-    memset(f->use->chars, 0, sizeof(f->use->chars[0]) * f->numchars);
+    f->use->chars = rfx_calloc(sizeof(f->use->chars[0]) * f->numchars);
     return 0;
 }
 
@@ -724,8 +767,8 @@ void swf_FontClearUsage(SWFFONT * f)
 {
     if (!f || !f->use)
 	return;
-    free(f->use->chars); f->use->chars = 0;
-    free(f->use); f->use = 0;
+    rfx_free(f->use->chars); f->use->chars = 0;
+    rfx_free(f->use); f->use = 0;
 }
 
 int swf_FontUse(SWFFONT * f, U8 * s)
@@ -746,7 +789,7 @@ int swf_FontUseGlyph(SWFFONT * f, int glyph)
 {
     if (!f->use) 
 	swf_FontInitUsage(f);
-    if(glyph < 0 || glyph > f->numchars)
+    if(glyph < 0 || glyph >= f->numchars)
 	return -1;
     f->use->chars[glyph] = 1;
     return 0;
@@ -754,7 +797,7 @@ int swf_FontUseGlyph(SWFFONT * f, int glyph)
 
 int swf_FontSetDefine(TAG * t, SWFFONT * f)
 {
-    U16 *ofs = (U16 *) malloc(f->numchars * 2);
+    U16 *ofs = (U16 *) rfx_alloc(f->numchars * 2);
     int p, i, j;
 
     if ((!t) || (!f))
@@ -782,7 +825,7 @@ int swf_FontSetDefine(TAG * t, SWFFONT * f)
 	    swf_SetSimpleShape(t, f->glyph[i].shape);
 
     swf_ResetWriteBits(t);
-    free(ofs);
+    rfx_free(ofs);
     return 0;
 }
 
@@ -910,14 +953,13 @@ int swf_FontSetDefine2(TAG * tag, SWFFONT * f)
 
 void swf_FontAddLayout(SWFFONT * f, int ascent, int descent, int leading)
 {
-    f->layout = (SWFLAYOUT *) malloc(sizeof(SWFLAYOUT));
+    f->layout = (SWFLAYOUT *) rfx_alloc(sizeof(SWFLAYOUT));
     f->layout->ascent = ascent;
     f->layout->descent = descent;
     f->layout->leading = leading;
     f->layout->kerningcount = 0;
     f->layout->kerning = 0;
-    f->layout->bounds = (SRECT *) malloc(sizeof(SRECT) * f->numchars);
-    memset(f->layout->bounds, 0, sizeof(SRECT) * f->numchars);
+    f->layout->bounds = (SRECT *) rfx_calloc(sizeof(SRECT) * f->numchars);
 }
 
 int swf_FontSetInfo(TAG * t, SWFFONT * f)
@@ -983,15 +1025,15 @@ void swf_FontFree(SWFFONT * f)
 		swf_ShapeFree(f->glyph[i].shape);
 		f->glyph[i].shape = NULL;
 	    }
-	free(f->glyph);
+	rfx_free(f->glyph);
 	f->glyph = NULL;
     }
     if (f->ascii2glyph) {
-	free(f->ascii2glyph);
+	rfx_free(f->ascii2glyph);
 	f->ascii2glyph = NULL;
     }
     if (f->glyph2ascii) {
-	free(f->glyph2ascii);
+	rfx_free(f->glyph2ascii);
 	f->glyph2ascii = NULL;
     }
     font_freename(f);
@@ -999,7 +1041,7 @@ void swf_FontFree(SWFFONT * f)
     font_freeglyphnames(f);
     font_freeusage(f);
 
-    free(f);
+    rfx_free(f);
 }
 
 int swf_TextSetInfoRecord(TAG * t, SWFFONT * font, U16 size, RGBA * color, int dx, int dy)
@@ -1020,10 +1062,24 @@ int swf_TextSetInfoRecord(TAG * t, SWFFONT * font, U16 size, RGBA * color, int d
 	else
 	    swf_SetRGB(t, color);
     }
-    if (dx)
-	swf_SetS16(t, dx);
-    if (dy)
-	swf_SetS16(t, dy);
+    if (dx) {
+	if(dx != SET_TO_ZERO) {
+	    if(dx>32767 || dx<-32768)
+		fprintf(stderr, "Warning: Horizontal char position overflow: %d\n", dx);
+	    swf_SetS16(t, dx);
+	} else {
+	    swf_SetS16(t, 0);
+	}
+    }
+    if (dy) {
+	if(dy != SET_TO_ZERO) {
+	    if(dy>32767 || dy<-32768)
+		fprintf(stderr, "Warning: Vertical char position overflow: %d\n", dy);
+	    swf_SetS16(t, dy);
+	} else {
+	    swf_SetS16(t, 0);
+	}
+    }
     if (font)
 	swf_SetU16(t, size);
 
@@ -1152,7 +1208,8 @@ U32 swf_TextGetWidth(SWFFONT * font, U8 * s, int scale)
 
 SRECT swf_TextCalculateBBoxUTF8(SWFFONT * font, U8 * s, int scale)
 {
-    int pos = 0;
+    int xpos = 0;
+    int ypos = 0;
     SRECT r;
     swf_GetRect(0, &r);
     while (*s) {
@@ -1161,12 +1218,12 @@ SRECT swf_TextCalculateBBoxUTF8(SWFFONT * font, U8 * s, int scale)
 	    int g = font->ascii2glyph[c];
 	    if (g >= 0) {
 		SRECT rn = font->layout->bounds[g];
-		rn.xmin = (rn.xmin * scale) / 20 / 100 + pos;
-		rn.xmax = (rn.xmax * scale) / 20 / 100 + pos;
-		rn.ymin = (rn.ymin * scale) / 20 / 100;
-		rn.ymax = (rn.ymax * scale) / 20 / 100;
+		rn.xmin = (rn.xmin * scale) / 20 / 100 + xpos;
+		rn.xmax = (rn.xmax * scale) / 20 / 100 + xpos;
+		rn.ymin = (rn.ymin * scale) / 20 / 100 + ypos;
+		rn.ymax = (rn.ymax * scale) / 20 / 100 + ypos;
 		swf_ExpandRect2(&r, &rn);
-		pos += (font->glyph[g].advance * scale) / 20 / 100;
+		xpos += (font->glyph[g].advance * scale) / 20 / 100;
 	    }
 	}
 	c++;
@@ -1181,7 +1238,7 @@ SWFFONT *swf_ReadFont(char *filename)
     SWF swf;
     if (!filename)
 	return 0;
-    f = open(filename, O_RDONLY);
+    f = open(filename, O_RDONLY|O_BINARY);
 
     if (f < 0 || swf_ReadSWF(f, &swf) < 0) {
 	fprintf(stderr, "%s is not a valid SWF font file or contains errors.\n", filename);
@@ -1354,7 +1411,7 @@ void swf_WriteFont(SWFFONT * font, char *filename)
 
     t = swf_InsertTag(t, ST_END);
 
-    f = open(filename, O_RDWR | O_CREAT | O_TRUNC, 0644);
+    f = open(filename, O_RDWR | O_CREAT | O_TRUNC | O_BINARY, 0644);
     if FAILED
 	(swf_WriteSWF(f, &swf)) fprintf(stderr, "WriteSWF() failed in writeFont().\n");
     close(f);
@@ -1462,9 +1519,8 @@ void swf_FontCreateLayout(SWFFONT * f)
     if (!f->numchars)
 	return;
 
-    f->layout = (SWFLAYOUT *) malloc(sizeof(SWFLAYOUT));
-    memset(f->layout, 0, sizeof(SWFLAYOUT));
-    f->layout->bounds = (SRECT *) malloc(f->numchars * sizeof(SRECT));
+    f->layout = (SWFLAYOUT *) rfx_calloc(sizeof(SWFLAYOUT));
+    f->layout->bounds = (SRECT *) rfx_alloc(f->numchars * sizeof(SRECT));
     f->layout->ascent = -32767;
     f->layout->descent = -32767;