* zlib is now optional

[swftools.git] / lib / modules / swftools.c

diff --git a/lib/modules/swftools.c b/lib/modules/swftools.c
index 2356dfb..0af2cbd 100644 (file)
--- a/lib/modules/swftools.c
+++ b/lib/modules/swftools.c
@@ -99,10 +99,12 @@ U16 swf_GetDefineID(TAG * t)
     case ST_DEFINEFONT:
     case ST_DEFINEFONT2:
     case ST_DEFINEFONTINFO: //pseudodefine
+    case ST_DEFINEFONTINFO2: //pseudodefine
     case ST_DEFINETEXT:
     case ST_DEFINETEXT2:
     case ST_DEFINESOUND:
     case ST_DEFINESPRITE:
+    case ST_DEFINEVIDEOSTREAM:
     case ST_NAMECHARACTER: //pseudodefine
       id = swf_GetU16(t);
       break;
@@ -113,6 +115,50 @@ U16 swf_GetDefineID(TAG * t)
   return id;
 }
 
+SRECT swf_GetDefineBBox(TAG * t)
+{
+  U32 oldTagPos;
+  U16 id = 0;
+  SRECT b1,b2;
+
+  oldTagPos = swf_GetTagPos(t);
+  swf_SetTagPos(t,0);
+
+  swf_GetRect(0, &b1);
+
+  switch (swf_GetTagID(t))
+  { case ST_DEFINESHAPE:
+    case ST_DEFINESHAPE2:
+    case ST_DEFINESHAPE3:
+    case ST_DEFINEEDITTEXT:
+    case ST_DEFINEBUTTON:
+    case ST_DEFINEBUTTON2:
+    case ST_DEFINETEXT:
+    case ST_DEFINETEXT2:
+    case ST_DEFINEVIDEOSTREAM:
+      id = swf_GetU16(t);
+      swf_GetRect(t, &b1);
+      break;
+    case ST_DEFINEMORPHSHAPE:
+      id = swf_GetU16(t);
+      swf_GetRect(t, &b1);
+      swf_GetRect(t, &b2);
+      swf_ExpandRect2(&b1, &b2);
+      break;
+    case ST_DEFINEBITSLOSSLESS:
+    case ST_DEFINEBITSLOSSLESS2:
+    case ST_DEFINEBITS:
+    case ST_DEFINEBITSJPEG2:
+    case ST_DEFINEBITSJPEG3:
+      // FIXME
+      break;
+  }
+
+  swf_SetTagPos(t,oldTagPos);
+
+  return b1;
+}
+
 U16 swf_GetPlaceID(TAG * t)
 // up to SWF 4.0
 { U32 oldTagPos;
@@ -162,6 +208,7 @@ static int swf_definingtagids[] =
  ST_DEFINEBUTTON,
  ST_DEFINEBUTTON2,
  ST_DEFINESOUND,
+ ST_DEFINEVIDEOSTREAM,
  -1
 };
 
@@ -185,9 +232,11 @@ static int swf_spritetagids[] =
 static int swf_pseudodefiningtagids[] = 
 {
  ST_DEFINEFONTINFO,
+ ST_DEFINEFONTINFO2,
  ST_DEFINEBUTTONCXFORM,
  ST_DEFINEBUTTONSOUND,
  ST_NAMECHARACTER,
+ ST_DOINITACTION,
  -1
 };
 
@@ -280,6 +329,8 @@ char* swf_GetName(TAG * t)
               swf_GetCXForm(t, &c, 1);
             if(flags&PF_RATIO)
               swf_GetU16(t);
+            if(flags&PF_CLIPACTION)
+              swf_GetU16(t);
             if(flags&PF_NAME) {
               swf_ResetReadBits(t);
               name = &t->data[swf_GetTagPos(t)];
@@ -434,7 +485,6 @@ void enumerateUsedIDs(TAG * tag, int base, void (*callback)(TAG*, int, void*), v
        case ST_FREECHARACTER: /* unusual tags, which all start with an ID */
        case ST_NAMECHARACTER:
        case ST_GENERATORTEXT:
-       case ST_MX3:
            callback(tag, tag->pos + base, callback_data);
         break;
        case ST_PLACEOBJECT:
@@ -572,11 +622,19 @@ void enumerateUsedIDs(TAG * tag, int base, void (*callback)(TAG*, int, void*), v
            break;
        }
        case ST_DEFINEFONTINFO:
+       case ST_DEFINEFONTINFO2:
+       case ST_VIDEOFRAME:
+           callback(tag, tag->pos + base, callback_data);
+       break;
+       case ST_DEFINEVIDEOSTREAM:
+       break;
+
+       case ST_DOINITACTION:
            callback(tag, tag->pos + base, callback_data);
        break;
 
-       case ST_DEFINEMORPHSHAPE: /* disabled for now (doesn't work) */
-       case ST_DEFINESHAPE3: // these thingies might have bitmap ids in their fillstyles
+       case ST_DEFINEMORPHSHAPE:
+       case ST_DEFINESHAPE3:
        num++; //fallthrough
        case ST_DEFINESHAPE2:
        num++; //fallthrough