git.asbjorn.biz
/
swftools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
some fixes for buggy fonts
[swftools.git]
/
lib
/
modules
/
swfobject.c
diff --git
a/lib/modules/swfobject.c
b/lib/modules/swfobject.c
index
d93a928
..
75d2f94
100644
(file)
--- a/
lib/modules/swfobject.c
+++ b/
lib/modules/swfobject.c
@@
-62,11
+62,11
@@
int swf_ObjectPlace(TAG * t,U16 id,U16 depth,MATRIX * m,CXFORM * cx,U8 * name)
{ U8 flags;
if (!t) return -1;
{ U8 flags;
if (!t) return -1;
- if(cx && cx->r1==0 && cx->g1==0 && cx->b1==0 && cx->a1==0
- && cx->r0==256 && cx->g0==256 && cx->b0==256 && cx->a0==256)
+ if(cx && id && cx->r1==0 && cx->g1==0 && cx->b1==0 && cx->a1==0
+ && cx->r0==256 && cx->g0==256 && cx->b0==256 && cx->a0==256)
cx = 0;
cx = 0;
- if(m && isUnitMatrix(m))
+ if(m && id && isUnitMatrix(m))
m = 0;
flags = (id?PF_CHAR:0)|(m?PF_MATRIX:0)|(cx?PF_CXFORM:0)|(name?PF_NAME:0)|((m||cx)&&(!id)?PF_MOVE:0);
m = 0;
flags = (id?PF_CHAR:0)|(m?PF_MATRIX:0)|(cx?PF_CXFORM:0)|(name?PF_NAME:0)|((m||cx)&&(!id)?PF_MOVE:0);
@@
-153,6
+153,7
@@
void swf_GetPlaceObject(TAG * tag,SWFPLACEOBJECT* obj)
memset(obj, 0, sizeof(SWFPLACEOBJECT));
swf_GetMatrix(0, &obj->matrix);
swf_GetCXForm(0, &obj->cxform, 1);
memset(obj, 0, sizeof(SWFPLACEOBJECT));
swf_GetMatrix(0, &obj->matrix);
swf_GetCXForm(0, &obj->cxform, 1);
+ //obj->internal = PF_CHAR|PF_MATRIX|PF_CXFORM;
return;
}
swf_SetTagPos(tag, 0);
return;
}
swf_SetTagPos(tag, 0);
@@
-162,6
+163,7
@@
void swf_GetPlaceObject(TAG * tag,SWFPLACEOBJECT* obj)
obj->depth = swf_GetU16(tag);
swf_GetMatrix(tag, &obj->matrix);
swf_GetCXForm(tag, &obj->cxform, 0);
obj->depth = swf_GetU16(tag);
swf_GetMatrix(tag, &obj->matrix);
swf_GetCXForm(tag, &obj->cxform, 0);
+ //obj->internal = PF_CHAR|PF_MATRIX|PF_CXFORM;
} else if(tag->id == ST_PLACEOBJECT2) {
flags = swf_GetU8(tag);
memset(obj,0,sizeof(SWFPLACEOBJECT));
} else if(tag->id == ST_PLACEOBJECT2) {
flags = swf_GetU8(tag);
memset(obj,0,sizeof(SWFPLACEOBJECT));
@@
-170,7
+172,8
@@
void swf_GetPlaceObject(TAG * tag,SWFPLACEOBJECT* obj)
swf_GetCXForm(0,&obj->cxform,1);
obj->depth = swf_GetU16(tag);
swf_GetCXForm(0,&obj->cxform,1);
obj->depth = swf_GetU16(tag);
- //flags&1: move
+ //obj->internal = flags;
+ if(flags&1) obj->move = 1;
if(flags&2) obj->id = swf_GetU16(tag);
if(flags&4) swf_GetMatrix(tag, &obj->matrix);
if(flags&8) swf_GetCXForm(tag, &obj->cxform,1);
if(flags&2) obj->id = swf_GetU16(tag);
if(flags&4) swf_GetMatrix(tag, &obj->matrix);
if(flags&8) swf_GetCXForm(tag, &obj->cxform,1);