X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fmodules%2Fswfobject.c;h=349824d74cd7120c312d104de831afe88b785372;hb=879d0eec420fe0fd5ddcd56c8fe62b82a6744edd;hp=ca6c6f3652b9d5df62cadeba55c59c62ac03a36d;hpb=6c3ab5574d31504d24710c2756899d49275c1a37;p=swftools.git

diff --git a/lib/modules/swfobject.c b/lib/modules/swfobject.c
index ca6c6f3..349824d 100644
--- a/lib/modules/swfobject.c
+++ b/lib/modules/swfobject.c
@@ -21,19 +21,8 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#define PF_MOVE         0x01
-#define PF_CHAR         0x02
-#define PF_MATRIX       0x04
-#define PF_CXFORM       0x08
-#define PF_RATIO        0x10
-#define PF_NAME         0x20
-#define PF_CLIPDEPTH    0x40
-#define PF_ACTIONEVENT  0x80
-
-#define PF2_FILTERS      0x01
-#define PF2_BLENDMODE    0x02
-#define PF2_ASBITMAP     0x04
-//...
+#include "../rfxswf.h"
+
 
 char*blendModeNames[] = {"normal","normal2","layer","multiply",
 		       "screen","lighten", "darken","add",
@@ -68,7 +57,7 @@ int isUnitCXForm(CXFORM* cx)
     return 0;
 }
 
-static int objectplace(TAG * t,U16 id,U16 depth,MATRIX * m,CXFORM * cx,U8 * name, U16 clipaction, U8 blendmode, FILTERLIST*filters)
+static int objectplace(TAG * t,U16 id,U16 depth,MATRIX * m,CXFORM * cx,const char * name, U16 clipaction, U8 blendmode, FILTERLIST*filters)
 { U8 flags,flags2;
   if (!t) return -1;
 
@@ -98,15 +87,15 @@ static int objectplace(TAG * t,U16 id,U16 depth,MATRIX * m,CXFORM * cx,U8 * name
     swf_SetU8(t,blendmode);
   return 0; 
 }
-int swf_ObjectPlace(TAG * t,U16 id,U16 depth,MATRIX * m,CXFORM * cx,U8 * name)
+int swf_ObjectPlace(TAG * t,U16 id,U16 depth,MATRIX * m,CXFORM * cx,const char * name)
 {
     return objectplace(t,id,depth,m,cx,name,0,0,0);
 }
-int swf_ObjectPlaceClip(TAG * t,U16 id,U16 depth,MATRIX * m,CXFORM * cx,U8 * name, U16 clipaction)
+int swf_ObjectPlaceClip(TAG * t,U16 id,U16 depth,MATRIX * m,CXFORM * cx,const char * name, U16 clipaction)
 { 
     return objectplace(t,id,depth,m,cx,name,clipaction,0,0);
 }
-int swf_ObjectPlaceBlend(TAG * t,U16 id,U16 depth,MATRIX * m,CXFORM * cx,U8 * name, U8 blend)
+int swf_ObjectPlaceBlend(TAG * t,U16 id,U16 depth,MATRIX * m,CXFORM * cx,const char * name, U8 blend)
 { 
     if(t->id != ST_PLACEOBJECT3)
 	fprintf(stderr, "wrong tag- ignoring blend mode\n");
@@ -164,8 +153,10 @@ void swf_SetPlaceObject(TAG * t,SWFPLACEOBJECT* obj)
 
 void swf_GetPlaceObject(TAG * tag,SWFPLACEOBJECT* obj)
 {
-    if(!tag) {
+    if(obj)
 	memset(obj, 0, sizeof(SWFPLACEOBJECT));
+
+    if(!tag) {
 	swf_GetMatrix(0, &obj->matrix);
 	swf_GetCXForm(0, &obj->cxform, 1);
 	//obj->internal = PF_CHAR|PF_MATRIX|PF_CXFORM;
@@ -207,7 +198,7 @@ void swf_GetPlaceObject(TAG * tag,SWFPLACEOBJECT* obj)
             l = strlen((const char *)&tag->data[tag->pos]);
             t = 0;
             data = (U8*)rfx_alloc(l+1);
-            obj->name = data;
+            obj->name = (char*)data;
             while((data[t++] = swf_GetU8(tag))); 
         }
 	if(flags2&PF2_BLENDMODE) {