From c4865209253f1606b0d4985e8fa6e4e33eaf1b8c Mon Sep 17 00:00:00 2001 From: kramm Date: Sat, 25 Jun 2005 13:42:28 +0000 Subject: [PATCH] fixed a bug for the tx/ty vector handling in swf_MatrixJoin(). --- lib/modules/swftools.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/lib/modules/swftools.c b/lib/modules/swftools.c index 5881827..163d855 100644 --- a/lib/modules/swftools.c +++ b/lib/modules/swftools.c @@ -42,13 +42,14 @@ MATRIX * swf_MatrixJoin(MATRIX * d,MATRIX * s1,MATRIX * s2) if (!s1) return (s2)?(MATRIX *)memcpy(d,s2,sizeof(MATRIX)):NULL; if (!s2) return (MATRIX *)memcpy(d,s1,sizeof(MATRIX)); - d->tx = s1->tx + s2->tx; - d->ty = s1->ty + s2->ty; + d->tx = RFXSWF_SP(s1->sx,s1->r1,s2->tx,s2->ty); + d->ty = RFXSWF_SP(s1->r0,s1->sy,s2->tx,s2->ty); d->sx = RFXSWF_SP(s1->sx,s1->r1,s2->sx,s2->r0); - d->sy = RFXSWF_SP(s1->r0,s1->sy,s2->r1,s2->sy); d->r0 = RFXSWF_SP(s1->r0,s1->sy,s2->sx,s2->r0); + d->r1 = RFXSWF_SP(s1->sx,s1->r1,s2->r1,s2->sy); + d->sy = RFXSWF_SP(s1->r0,s1->sy,s2->r1,s2->sy); //DumpMatrix(NULL,d); @@ -911,6 +912,13 @@ U8 swf_isPlaceTag(TAG*tag) return 1; return 0; } +U8 swf_isTextTag(TAG*tag) +{ + if(tag->id == ST_DEFINETEXT || + tag->id == ST_DEFINETEXT2) + return 1; + return 0; +} U8 swf_isImageTag(TAG*tag) { -- 1.7.10.4