X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fmodules%2Fswftools.c;h=f3a4b94d481298bb114811eb1f8a28cccefe7c26;hb=ac58a40c594fa441eb4192cc4c86068372a7f18e;hp=e46bd77bd173c5dc302eef28d74a2111e39af20a;hpb=664544cae79530caa45ccf382f620e9dd5e55996;p=swftools.git

diff --git a/lib/modules/swftools.c b/lib/modules/swftools.c
index e46bd77..f3a4b94 100644
--- a/lib/modules/swftools.c
+++ b/lib/modules/swftools.c
@@ -116,8 +116,10 @@ U16 swf_GetDefineID(TAG * t)
     case ST_DEFINESPRITE:
     case ST_DEFINEMOVIE:
     case ST_DEFINEVIDEOSTREAM:
+    case ST_GLYPHNAMES: //pseudodefine
     case ST_VIDEOFRAME: //pseudodefine
     case ST_NAMECHARACTER: //pseudodefine
+    case ST_DOINITACTION: //pseudodefine
       id = swf_GetU16(t);
       break;
   }
@@ -143,8 +145,6 @@ SRECT swf_GetDefineBBox(TAG * t)
     case ST_DEFINESHAPE2:
     case ST_DEFINESHAPE3:
     case ST_DEFINEEDITTEXT:
-    case ST_DEFINEBUTTON:
-    case ST_DEFINEBUTTON2:
     case ST_DEFINETEXT:
     case ST_DEFINETEXT2:
     case ST_DEFINEVIDEOSTREAM:
@@ -250,6 +250,7 @@ static int swf_pseudodefiningtagids[] =
  ST_NAMECHARACTER,
  ST_DOINITACTION,
  ST_VIDEOFRAME,
+ ST_GLYPHNAMES,
  -1
 };
 
@@ -658,6 +659,7 @@ void enumerateUsedIDs(TAG * tag, int base, void (*callback)(TAG*, int, void*), v
 	    }
 	    break;
 	}
+	case ST_GLYPHNAMES:
 	case ST_DEFINEFONTINFO:
 	case ST_DEFINEFONTINFO2:
 	case ST_VIDEOFRAME:
@@ -871,6 +873,9 @@ void swf_RelocateDepth(SWF*swf, char*bitmap)
 
     while(tag)
     {
+	/* TODO * clip depths 
+	        * sprites
+	 */
 	int depth = swf_GetDepth(tag);
 	if(depth>=0) {
 	    int newdepth = depth+nr;
@@ -889,9 +894,9 @@ TAG* swf_Concatenate (TAG*list1,TAG*list2)
     TAG*tag=0,*lasttag=0;
     char bitmap[65536];
     char depthmap[65536];
+    SWF swf1,swf2;
     memset(bitmap, 0, sizeof(bitmap));
     memset(depthmap, 0, sizeof(depthmap));
-    SWF swf1,swf2;
     memset(&swf1, 0, sizeof(swf1));
     memset(&swf2, 0, sizeof(swf2));