From: kramm <kramm>
Date: Thu, 11 Nov 2004 09:33:38 +0000 (+0000)
Subject: added dummy xpos to swf_TextCalculateBBoxUTF8().
X-Git-Tag: release-0-6-3~194
X-Git-Url: http://git.asbjorn.biz/?a=commitdiff_plain;h=210530b62a1389c48a289cdcd607f9207d80f76e;p=swftools.git

added dummy xpos to swf_TextCalculateBBoxUTF8().
---

diff --git a/lib/modules/swftext.c b/lib/modules/swftext.c
index 87c278a..69edf6c 100644
--- a/lib/modules/swftext.c
+++ b/lib/modules/swftext.c
@@ -1152,7 +1152,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 +1162,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++;