X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fmodules%2Fswfrender.c;h=64dc69644c350f29dd26a3f7e75df0e43334ee53;hb=c106eb250125f8d7fac2be40b4b4cb1d4cf0dcc4;hp=8be9cef7c53b4d0e9764385483ad55058fb4dc7a;hpb=09dcad8fdd10d7f4ca0be5d26e264c4f90bf3896;p=swftools.git

diff --git a/lib/modules/swfrender.c b/lib/modules/swfrender.c
index 8be9cef..64dc696 100644
--- a/lib/modules/swfrender.c
+++ b/lib/modules/swfrender.c
@@ -1012,7 +1012,10 @@ static void textcallback(void*self, int*chars, int*xpos, int nr, int fontid, int
     textcallbackblock_t * info = (textcallbackblock_t*)self;
     font_t*font = 0;
     int t;
-    if(!info->idtable[fontid].obj.font) {
+    if(info->idtable[fontid].type != font_type) {
+	fprintf(stderr, "ID %d is not a font\n", fontid);
+	return;
+    } else if(!info->idtable[fontid].obj.font) {
 	fprintf(stderr, "Font %d unknown\n", fontid);
 	return;
     } else {
@@ -1031,8 +1034,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 +1158,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;