X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fmodules%2Fswfobject.c;h=05316b9174fbfc8cd3a4554e1e1f312a5130b659;hb=2ca9fe661a4260ee254edbf54f9591d09801de43;hp=55b9b1ce075da9f632c5d04db6e9493b35770d92;hpb=c106eb250125f8d7fac2be40b4b4cb1d4cf0dcc4;p=swftools.git

diff --git a/lib/modules/swfobject.c b/lib/modules/swfobject.c
index 55b9b1c..05316b9 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",
@@ -136,7 +125,7 @@ void swf_SetPlaceObject(TAG * t,SWFPLACEOBJECT* obj)
 	flags2 = (0?PF2_ASBITMAP:0)|(obj->blendmode?PF2_BLENDMODE:0)|(obj->filters?PF2_FILTERS:0);
 
 	swf_SetU8(t,flags);
-	if(t->id == ST_PLACEOBJECT2) 
+	if(t->id == ST_PLACEOBJECT3) 
 	    swf_SetU8(t,flags2);
 	swf_SetU16(t,obj->depth);
 	if (flags&PF_CHAR) swf_SetU16(t,obj->id);
@@ -149,7 +138,10 @@ void swf_SetPlaceObject(TAG * t,SWFPLACEOBJECT* obj)
 	if (flags&PF_NAME) swf_SetString(t,obj->name);
 
 	if (flags2&PF2_FILTERS) {
-	    // ...
+	    swf_SetU8(t,obj->filters->num);
+	    int s;
+	    for(s=0;s<obj->filters->num;s++)
+		swf_SetFilter(t,obj->filters->filter[s]);
 	}
 	if (flags2&PF2_BLENDMODE)
 	    swf_SetU8(t,obj->blendmode);
@@ -201,9 +193,9 @@ void swf_GetPlaceObject(TAG * tag,SWFPLACEOBJECT* obj)
             int l,t;
             U8*data;
             swf_ResetReadBits(tag);
-            l = strlen(&tag->data[tag->pos]);
+            l = strlen((const char *)&tag->data[tag->pos]);
             t = 0;
-            data = rfx_alloc(l+1);
+            data = (U8*)rfx_alloc(l+1);
             obj->name = data;
             while((data[t++] = swf_GetU8(tag))); 
         }