git.asbjorn.biz
/
swftools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
improved scaling for monochrome images
[swftools.git]
/
lib
/
modules
/
swfobject.c
diff --git
a/lib/modules/swfobject.c
b/lib/modules/swfobject.c
index
5789fef
..
d108ade
100644
(file)
--- a/
lib/modules/swfobject.c
+++ b/
lib/modules/swfobject.c
@@
-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);
@@
-185,7
+188,7
@@
void swf_GetPlaceObject(TAG * tag,SWFPLACEOBJECT* obj)
swf_ResetReadBits(tag);
l = strlen(&tag->data[tag->pos]);
t = 0;
swf_ResetReadBits(tag);
l = strlen(&tag->data[tag->pos]);
t = 0;
- data = malloc(l+1);
+ data = rfx_alloc(l+1);
obj->name = data;
while((data[t++] = swf_GetU8(tag)));
}
obj->name = data;
while((data[t++] = swf_GetU8(tag)));
}
@@
-200,7
+203,6
@@
void swf_GetPlaceObject(TAG * tag,SWFPLACEOBJECT* obj)
void swf_PlaceObjectFree(SWFPLACEOBJECT* obj)
{
if(obj->name)
void swf_PlaceObjectFree(SWFPLACEOBJECT* obj)
{
if(obj->name)
- free(obj->name);
- free(obj);
+ rfx_free(obj->name);
}
}