X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fmodules%2Fswfobject.c;h=75d2f94f92b9bfc72021d568ae84ca84f191ebd2;hb=965fb2d8ab551a8544f85bf1ab7441bcd0c7c2c5;hp=d1a7632fb126f7a1a3c6bd3c49ebcb65599bb46a;hpb=b4d8a377dda2304c89718985b2c2309d2109e036;p=swftools.git

diff --git a/lib/modules/swfobject.c b/lib/modules/swfobject.c
index d1a7632..75d2f94 100644
--- 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;
 
-  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;
 
-  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);
@@ -153,44 +153,56 @@ void swf_GetPlaceObject(TAG * tag,SWFPLACEOBJECT* obj)
 	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);
     
-    flags = swf_GetU8(tag);
-    memset(obj,0,sizeof(SWFPLACEOBJECT));
-	
-    swf_GetMatrix(0,&obj->matrix);
-    swf_GetCXForm(0,&obj->cxform,1);
-
-    obj->depth = swf_GetU16(tag);
-    //flags&1: move
-    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&16) obj->ratio = swf_GetU16(tag);
-    /* if you modify the order of these operations, also
-       modify it in ../src/swfcombine.c */
-    if(flags&64) 
-	obj->clipdepth = swf_GetU16(tag); //clip
-    if(flags&32) {
-	int l,t;
-	U8*data;
-	swf_ResetReadBits(tag);
-	l = strlen(&tag->data[tag->pos]);
-	t = 0;
-	data = malloc(l+1);
-	obj->name = data;
-	while((data[t++] = swf_GetU8(tag))); 
+    if(tag->id == ST_PLACEOBJECT) {
+	obj->id = swf_GetU16(tag);
+	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));
+            
+        swf_GetMatrix(0,&obj->matrix);
+        swf_GetCXForm(0,&obj->cxform,1);
+
+        obj->depth = swf_GetU16(tag);
+	//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&16) obj->ratio = swf_GetU16(tag);
+        /* if you modify the order of these operations, also
+           modify it in ../src/swfcombine.c */
+        if(flags&64) 
+            obj->clipdepth = swf_GetU16(tag); //clip
+        if(flags&32) {
+            int l,t;
+            U8*data;
+            swf_ResetReadBits(tag);
+            l = strlen(&tag->data[tag->pos]);
+            t = 0;
+            data = rfx_alloc(l+1);
+            obj->name = data;
+            while((data[t++] = swf_GetU8(tag))); 
+        }
+
+        /* Actionscript ignored (for now) */
+        obj->actions = 0;
+    } else {
+        fprintf(stderr, "rfxswf: Bad Tag: %d not a placeobject\n", tag->id);
     }
-
-    /* Actionscript ignored (for now) */
-    obj->actions = 0;
 }
 
 void swf_PlaceObjectFree(SWFPLACEOBJECT* obj)
 {
     if(obj->name)
-	free(obj->name);
-    free(obj);
+	rfx_free(obj->name);
 }