From: kramm <kramm>
Date: Sun, 16 Apr 2006 13:36:27 +0000 (+0000)
Subject: fixed bug in character matrix calculation
X-Git-Tag: release-0-8-0~224
X-Git-Url: http://git.asbjorn.biz/?a=commitdiff_plain;h=9deba2eb79e1335dad1bbf5d36477558f6fa4f19;hp=916fb93fed7837d46de4254a0e623f6bc3d7e994;p=swftools.git

fixed bug in character matrix calculation
---

diff --git a/lib/modules/swfrender.c b/lib/modules/swfrender.c
index 8be9cef..994ac29 100644
--- a/lib/modules/swfrender.c
+++ b/lib/modules/swfrender.c
@@ -1031,8 +1031,8 @@ static void textcallback(void*self, int*chars, int*xpos, int nr, int fontid, int
 	m.sy = (m.sy * fontsize) / 1024;
 	m.r0 = (m.r0 * fontsize) / 1024;
 	m.r1 = (m.r1 * fontsize) / 1024;
-	m.tx += p.x;
-	m.ty += p.y;
+	m.tx = p.x;
+	m.ty = p.y;
 
 	if(chars[t]<0 || chars[t]>= font->numchars) {
 	    fprintf(stderr, "Character out of range: %d\n", chars[t]);
@@ -1155,11 +1155,13 @@ void swf_RenderSWF(RENDERBUF*buf, SWF*swf)
 	    swf_GetU16(tag);
 	    swf_GetRect(tag,0);
   	    swf_GetMatrix(tag,&m);
-	    swf_MatrixJoin(&info.m, &m, &p->matrix);
+	    swf_MatrixJoin(&info.m, &p->matrix, &m);
 	    /*printf("Text matrix:\n");
 	    swf_DumpMatrix(stdout, &m);
 	    printf("Placement matrix:\n");
-	    swf_DumpMatrix(stdout, &p->matrix);*/
+	    swf_DumpMatrix(stdout, &p->matrix);
+	    printf("Final matrix:\n");
+	    swf_DumpMatrix(stdout, &info.m);*/
 
 	    info.idtable = idtable;
 	    info.depth = p->depth;