git.asbjorn.biz
/
swftools.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
979c1dc
)
fixed (tx,ty) handling in matrix multiplication
author
kramm
<kramm>
Tue, 5 Jul 2005 07:45:36 +0000
(07:45 +0000)
committer
kramm
<kramm>
Tue, 5 Jul 2005 07:45:36 +0000
(07:45 +0000)
lib/modules/swftools.c
patch
|
blob
|
history
diff --git
a/lib/modules/swftools.c
b/lib/modules/swftools.c
index
58962e1
..
5f16339
100644
(file)
--- a/
lib/modules/swftools.c
+++ b/
lib/modules/swftools.c
@@
-42,8
+42,8
@@
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));
if (!s1) return (s2)?(MATRIX *)memcpy(d,s2,sizeof(MATRIX)):NULL;
if (!s2) return (MATRIX *)memcpy(d,s1,sizeof(MATRIX));
- 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->tx = s1->tx + RFXSWF_SP(s1->sx,s1->r1,s2->tx,s2->ty);
+ d->ty = s1->ty + RFXSWF_SP(s1->r0,s1->sy,s2->tx,s2->ty);
d->sx = RFXSWF_SP(s1->sx,s1->r1,s2->sx,s2->r0);
d->r0 = RFXSWF_SP(s1->r0,s1->sy,s2->sx,s2->r0);
d->sx = RFXSWF_SP(s1->sx,s1->r1,s2->sx,s2->r0);
d->r0 = RFXSWF_SP(s1->r0,s1->sy,s2->sx,s2->r0);