X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fmodules%2Fswftools.c;h=63943c73d0ae1cdbe00b9f9f843ea18f3374f05e;hb=965fb2d8ab551a8544f85bf1ab7441bcd0c7c2c5;hp=a1befc2d9ff4d22267fe5806e7eef55ccb8b119f;hpb=8e25098de7ef9a45bc7bac9f55aa439d33394bd2;p=swftools.git

diff --git a/lib/modules/swftools.c b/lib/modules/swftools.c
index a1befc2..63943c7 100644
--- a/lib/modules/swftools.c
+++ b/lib/modules/swftools.c
@@ -7,17 +7,29 @@
 
    Copyright (c) 2000, 2001 Rainer Böhme <rfxswf@reflex-studio.de>
  
-   This file is distributed under the GPL, see file COPYING for details 
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
 
-*/
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 // Matrix & Math tools for SWF files
 
 #define S64 long long
 SFIXED RFXSWF_SP(SFIXED a1,SFIXED a2,SFIXED b1,SFIXED b2)
-{ S64 a;
-  a = (S64)a1*(S64)b1+(S64)a2*(S64)b2;
-  return (SFIXED)(a>>16);
+{ S64 a = ((S64)a1*(S64)b1+(S64)a2*(S64)b2)>>16;
+  SFIXED result = (SFIXED)(a);
+  if(a!=result) 
+      fprintf(stderr, "Warning: overflow in matrix multiplication");
+  return result;
 }
 SFIXED RFXSWF_QFIX(int zaehler,int nenner) // bildet Quotient von zwei INTs in SFIXED
 { S64 z = zaehler<<16;
@@ -32,13 +44,14 @@ MATRIX * swf_MatrixJoin(MATRIX * d,MATRIX * s1,MATRIX * s2)
   if (!s1) return (s2)?(MATRIX *)memcpy(d,s2,sizeof(MATRIX)):NULL;
   if (!s2) return (MATRIX *)memcpy(d,s1,sizeof(MATRIX));
   
-  d->tx = s1->tx + s2->tx;
-  d->ty = s1->ty + s2->ty;
+  d->tx = s1->tx + RFXSWF_SP(s1->sx,s1->r1,s2->tx,s2->ty);
+  d->ty = s1->ty + RFXSWF_SP(s1->r0,s1->sy,s2->tx,s2->ty);
   
   d->sx = RFXSWF_SP(s1->sx,s1->r1,s2->sx,s2->r0);
-  d->sy = RFXSWF_SP(s1->r0,s1->sy,s2->r1,s2->sy);
   d->r0 = RFXSWF_SP(s1->r0,s1->sy,s2->sx,s2->r0);
+
   d->r1 = RFXSWF_SP(s1->sx,s1->r1,s2->r1,s2->sy);
+  d->sy = RFXSWF_SP(s1->r0,s1->sy,s2->r1,s2->sy);
 
   //DumpMatrix(NULL,d);
   
@@ -65,6 +78,14 @@ MATRIX * swf_MatrixMapTriangle(MATRIX * m,int dx,int dy,int x0,int y0,
   return m;
 }
 
+void swf_SetDefineID(TAG * tag, U16 newid)
+{
+  int oldlen = tag->len;
+  tag->len = 0;
+  swf_SetU16(tag, newid); /* set defining ID */
+  tag->len = oldlen;
+}
+
 U16 swf_GetDefineID(TAG * t)
 // up to SWF 4.0
 { U32 oldTagPos;
@@ -77,6 +98,7 @@ U16 swf_GetDefineID(TAG * t)
   { case ST_DEFINESHAPE:
     case ST_DEFINESHAPE2:
     case ST_DEFINESHAPE3:
+    case ST_DEFINESHAPE4:
     case ST_DEFINEMORPHSHAPE:
     case ST_DEFINEEDITTEXT:
     case ST_DEFINEBITS:
@@ -84,20 +106,32 @@ U16 swf_GetDefineID(TAG * t)
     case ST_DEFINEBITSJPEG3:
     case ST_DEFINEBITSLOSSLESS:
     case ST_DEFINEBITSLOSSLESS2:
+    case ST_DEFINESCALINGGRID: //pseudodefine
     case ST_DEFINEBUTTON:
     case ST_DEFINEBUTTON2:
     case ST_DEFINEBUTTONCXFORM: //pseudodefine
     case ST_DEFINEBUTTONSOUND: //pseudodefine
+    case ST_CSMTEXTSETTINGS: //pseudodefine
     case ST_DEFINEFONT:
     case ST_DEFINEFONT2:
+    case ST_DEFINEFONT3:
     case ST_DEFINEFONTINFO: //pseudodefine
+    case ST_DEFINEFONTINFO2: //pseudodefine
+    case ST_DEFINEFONTALIGNZONES: //pseudodefine
     case ST_DEFINETEXT:
     case ST_DEFINETEXT2:
     case ST_DEFINESOUND:
     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;
+    default:
+      fprintf(stderr, "rfxswf: Error: tag %d (%s) has no id\n", t->id, swf_TagGetName(t));
   }
 
   swf_SetTagPos(t,oldTagPos);
@@ -105,6 +139,49 @@ U16 swf_GetDefineID(TAG * t)
   return id;
 }
 
+SRECT swf_GetDefineBBox(TAG * t)
+{
+  U32 oldTagPos;
+  U16 id = 0;
+  SRECT b1,b2;
+  memset(&b1, 0, sizeof(b1));
+
+  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_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;
@@ -116,6 +193,7 @@ U16 swf_GetPlaceID(TAG * t)
   switch (swf_GetTagID(t))
   { case ST_PLACEOBJECT:
     case ST_REMOVEOBJECT:
+    case ST_FREECHARACTER:
     case ST_STARTSOUND:
       id = swf_GetU16(t);
       break;
@@ -137,9 +215,11 @@ static int swf_definingtagids[] =
 {ST_DEFINESHAPE,
  ST_DEFINESHAPE2,
  ST_DEFINESHAPE3,
+ ST_DEFINESHAPE4,
  ST_DEFINEMORPHSHAPE,
  ST_DEFINEFONT,
  ST_DEFINEFONT2,
+ ST_DEFINEFONT3,
  ST_DEFINETEXT,
  ST_DEFINETEXT2,
  ST_DEFINEEDITTEXT,
@@ -153,6 +233,7 @@ static int swf_definingtagids[] =
  ST_DEFINEBUTTON,
  ST_DEFINEBUTTON2,
  ST_DEFINESOUND,
+ ST_DEFINEVIDEOSTREAM,
  -1
 };
 
@@ -173,12 +254,20 @@ static int swf_spritetagids[] =
  -1
 };
 
+/* tags which add content or information to a character with a given ID */
 static int swf_pseudodefiningtagids[] = 
 {
  ST_DEFINEFONTINFO,
+ ST_DEFINEFONTINFO2,
+ ST_DEFINEFONTALIGNZONES,
  ST_DEFINEBUTTONCXFORM,
  ST_DEFINEBUTTONSOUND,
+ ST_DEFINESCALINGGRID,
+ ST_CSMTEXTSETTINGS,
  ST_NAMECHARACTER,
+ ST_DOINITACTION,
+ ST_VIDEOFRAME,
+ ST_GLYPHNAMES,
  -1
 };
 
@@ -221,10 +310,9 @@ U8 swf_isPseudoDefiningTag(TAG * tag)
     return 0; 
 }
 
-U16 swf_GetDepth(TAG * t)
-// up to SWF 4.0
+int swf_GetDepth(TAG * t)
 { 
-  U16 depth = 0;
+  int depth = -1;
   U32 oldTagPos;
   oldTagPos = swf_GetTagPos(t);
   swf_SetTagPos(t,0);
@@ -242,11 +330,36 @@ U16 swf_GetDepth(TAG * t)
     { U8 flags = swf_GetU8(t);
       depth = swf_GetU16(t);
     } break;
+    case ST_SETTABINDEX:
+    {
+      depth = swf_GetU16(t);
+    }
   }
   swf_SetTagPos(t,oldTagPos);
   return depth;
 }
 
+void swf_SetDepth(TAG * t, U16 depth)
+{ 
+  switch (swf_GetTagID(t))
+  { case ST_PLACEOBJECT:
+    case ST_REMOVEOBJECT:
+      PUT16(t->data, depth);
+      break;
+    case ST_REMOVEOBJECT2:
+      PUT16(t->data, depth);
+      break;
+    case ST_PLACEOBJECT2:
+      PUT16(&t->data[1], depth);
+      break;
+    case ST_SETTABINDEX:
+      PUT16(t->data, depth);
+      break;
+    default:
+      fprintf(stderr, "rfxswf: Error: tag %d has no depth\n", t->id);
+  }
+}
+
 char* swf_GetName(TAG * t)
 {
     char* name = 0;
@@ -260,8 +373,11 @@ char* swf_GetName(TAG * t)
         case ST_FRAMELABEL:
             name = &t->data[swf_GetTagPos(t)];
         break;
+        case ST_PLACEOBJECT3:
         case ST_PLACEOBJECT2: {   
             U8 flags = swf_GetU8(t);
+	    if(t->id == ST_PLACEOBJECT3)
+		swf_GetU8(t);
             swf_GetU16(t); //depth;
             if(flags&PF_CHAR) 
               swf_GetU16(t); //id
@@ -271,6 +387,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)];
@@ -282,3 +400,846 @@ char* swf_GetName(TAG * t)
     return name;
 }
 
+/* used in enumerateUsedIDs */
+void swf_GetMorphGradient(TAG * tag, GRADIENT * gradient1, GRADIENT * gradient2)
+{
+    GRADIENT dummy1;
+    GRADIENT dummy2;
+    int t;
+    if(!gradient1)
+	gradient1 = &dummy1;
+    if(!gradient2)
+	gradient2 = &dummy2;
+    gradient1->num = 
+    gradient2->num = swf_GetU8(tag);
+    for(t=0;t<gradient1->num;t++)
+    {
+	int s=t;
+	if(s>=8) //FIXME
+	    s=7;
+	gradient1->ratios[t] = swf_GetU8(tag);
+	swf_GetRGBA(tag, &gradient1->rgba[t]);
+	gradient2->ratios[t] = swf_GetU8(tag);
+	swf_GetRGBA(tag, &gradient2->rgba[t]);
+    }
+}
+
+#define DEBUG_ENUMERATE if(0)
+
+void enumerateUsedIDs_styles(TAG * tag, void (*callback)(TAG*, int, void*), void*callback_data, int num, int morph)
+{
+    U16 count;
+    int t;
+    count = swf_GetU8(tag);
+    if(count == 0xff && num>1) // defineshape2,3 only
+	count = swf_GetU16(tag);
+
+    for(t=0;t<count;t++)
+    {
+	int type;
+	U8*pos;
+	swf_ResetReadBits(tag);
+	type = swf_GetU8(tag); //type
+	if(type == 0) {
+	    if(num == 3)
+		{swf_GetRGBA(tag, NULL);if(morph) swf_GetRGBA(tag, NULL);}
+	    else 
+		{swf_GetRGB(tag, NULL);if(morph) swf_GetRGB(tag, NULL);}
+	}
+	else if(type == 0x10 || type == 0x12 || type == 0x13)
+	{
+	    swf_ResetReadBits(tag);
+	    swf_GetMatrix(tag, NULL);
+	    if(morph)
+		swf_GetMatrix(tag, NULL);
+	    swf_ResetReadBits(tag);
+	    if(morph)
+		swf_GetMorphGradient(tag, NULL, NULL);
+	    else
+		swf_GetGradient(tag, NULL, /*alpha*/ num>=3?1:0);
+	}
+	else if(type == 0x40 || type == 0x41 || type == 0x42 || type == 0x43)
+	{
+	    swf_ResetReadBits(tag);
+	    // we made it.
+	    if(tag->data[tag->pos] != 0xff ||
+	       tag->data[tag->pos+1] != 0xff)
+	    (callback)(tag, tag->pos, callback_data);
+
+	    swf_GetU16(tag);
+	    swf_ResetReadBits(tag);
+	    swf_GetMatrix(tag, NULL);
+	    if(morph)
+		swf_GetMatrix(tag, NULL);
+	}
+	else {
+	    fprintf(stderr, "rfxswf:swftools.c Unknown fillstyle:0x%02x\n",type);
+	}
+    }
+    swf_ResetReadBits(tag);
+    count = swf_GetU8(tag); // line style array
+    if(count == 0xff)
+	count = swf_GetU16(tag);
+    for(t=0;t<count;t++) 
+    {
+	swf_GetU16(tag);
+	if(morph)
+	    swf_GetU16(tag);
+	if(num == 3)
+	    {swf_GetRGBA(tag, NULL);if(morph) swf_GetRGBA(tag, NULL);}
+	else
+	    {swf_GetRGB(tag, NULL);if(morph) swf_GetRGB(tag, NULL);}
+    }
+}
+
+void enumerateUsedIDs(TAG * tag, int base, void (*callback)(TAG*, int, void*), void*callback_data)
+{
+    int num = 1;
+    swf_ResetReadBits(tag);
+    tag->pos = 0;
+    switch(tag->id)
+    {
+	case ST_DEFINEBUTTONSOUND: {
+	    int t;
+	    callback(tag, tag->pos + base, callback_data);
+	    for(t=0;t<4;t++) {
+		int flags;
+		callback(tag, tag->pos + base, callback_data);
+		swf_GetU16(tag); //sound id
+		flags = swf_GetU8(tag);
+		if(flags&1)
+		    swf_GetU32(tag); // in point
+		if(flags&2)
+		    swf_GetU32(tag); // out points
+		if(flags&4)
+		    swf_GetU16(tag); // loop count
+		if(flags&8)
+		{
+		    int npoints = swf_GetU8(tag);
+		    int s;
+		    for(s=0;s<npoints;s++)
+		    {
+			swf_GetU32(tag);
+			swf_GetU16(tag);
+			swf_GetU16(tag);
+		    }
+		}
+	    }
+        } break;
+	case ST_DEFINEBUTTONCXFORM:
+	    callback(tag, tag->pos + base, callback_data); //button id
+	break;
+
+	case ST_EXPORTASSETS: {
+	    int num =  swf_GetU16(tag);
+	    int t;
+	    for(t=0;t<num;t++) {
+		callback(tag, tag->pos + base, callback_data); //button id
+		swf_GetU16(tag); //id
+		while(swf_GetU8(tag)); //name
+	    }
+	} break;
+
+	case ST_IMPORTASSETS: 
+	case ST_IMPORTASSETS2: {
+	    swf_GetString(tag); //count
+	    swf_GetU8(tag); //reserved
+	    swf_GetU8(tag); //reserved
+	    int num =  swf_GetU16(tag); //url
+	    int t;
+	    for(t=0;t<num;t++) {
+		callback(tag, tag->pos + base, callback_data); //button id
+		swf_GetU16(tag); //id
+		while(swf_GetU8(tag)); //name
+	    }
+	} break;
+
+	case ST_FREECHARACTER: /* unusual tags, which all start with an ID */
+	case ST_NAMECHARACTER:
+	case ST_GENERATORTEXT:
+	    callback(tag, tag->pos + base, callback_data);
+        break;
+	case ST_PLACEOBJECT:
+	    callback(tag, tag->pos + base, callback_data);
+        break;
+	case ST_PLACEOBJECT2:
+	    // only if placeflaghascharacter
+	    if(!(tag->data[0]&2))
+		break;
+	    callback(tag, 3 + base, callback_data);
+        break;
+	case ST_PLACEOBJECT3:
+	    // only if placeflaghascharacter
+	    if(!(tag->data[0]&2))
+		break;
+	    callback(tag, 4 + base, callback_data);
+        break;
+	case ST_REMOVEOBJECT:
+	    callback(tag, tag->pos + base, callback_data);
+	break;
+	case ST_STARTSOUND:
+	    callback(tag, tag->pos + base, callback_data);
+	break;
+	case ST_DEFINESPRITE: {
+	    if(tag->len <= 4)
+		break; // sprite is expanded
+
+	    swf_GetU16(tag); // id
+	    swf_GetU16(tag); // framenum
+
+	    while(1) {
+		U16 flags = swf_GetU16(tag);
+		U32 len;
+		U16 id = flags>>6;
+		TAG *tag2 = swf_InsertTag(NULL, id);
+		len = flags&0x3f;
+		if(len == 63)
+		    len = swf_GetU32(tag);
+		if(id == ST_END)
+		    break;
+		tag2->len = tag2->memsize = len;
+		tag2->data = rfx_alloc(len);
+		memcpy(tag2->data, &tag->data[tag->pos], len);
+		/* I never saw recursive sprites, but they are (theoretically) 
+		   possible, so better add base here again */
+		enumerateUsedIDs(tag2, tag->pos + base, callback, callback_data);
+		swf_DeleteTag(tag2);
+		swf_GetBlock(tag, NULL, len);
+	    }
+	} 
+	break;
+	case ST_DEFINEBUTTON2: // has some font ids in the button records
+	    num++; 
+	//fallthrough
+	case ST_DEFINEBUTTON: {
+	    swf_GetU16(tag); //button id
+	    if(num>1)
+	    { 
+		int offset;
+		swf_GetU8(tag); //flag
+		offset = swf_GetU16(tag); //offset
+	    }
+	    while(1)
+	    {
+		U16 charid;
+		if(!swf_GetU8(tag)) //flags
+		    break; 
+		callback(tag, tag->pos + base, callback_data);
+		swf_GetU16(tag); //char
+		swf_GetU16(tag); //layer
+		swf_ResetReadBits(tag);
+		swf_GetMatrix(tag, NULL);
+		if(num>1) {
+		  swf_ResetReadBits(tag);
+		  swf_GetCXForm(tag, NULL, 1);
+		}
+	    }
+	    // ...
+	}
+	break;
+	case ST_DEFINEEDITTEXT:  {
+	    U8 flags1,flags2;
+	    swf_GetU16(tag); //id
+	    swf_GetRect(tag, NULL); //bounding box
+	    swf_ResetReadBits(tag);
+	    flags1 = swf_GetU8(tag);
+	    flags2 = swf_GetU8(tag);
+	    if(flags1 & 1)
+		callback(tag, tag->pos + base, callback_data);
+	}
+	break;
+	case ST_DEFINETEXT2:
+	    num ++;
+	case ST_DEFINETEXT: { 
+	    int glyphbits, advancebits;
+	    int id;
+	    id = swf_GetU16(tag); //id
+	    swf_GetRect(tag, NULL); //bounding box
+	    swf_ResetReadBits(tag);
+	    swf_GetMatrix(tag, NULL); //matrix
+	    swf_ResetReadBits(tag);
+	    glyphbits = swf_GetU8(tag); //glyphbits
+	    advancebits = swf_GetU8(tag); //advancebits
+	    while(1) {
+		U16 flags;
+		int t;
+		swf_ResetReadBits(tag);
+		flags = swf_GetBits(tag, 8);
+		if(!flags) break;
+		
+		swf_ResetReadBits(tag);
+		if(flags & 8) { // hasfont
+		    callback(tag, tag->pos + base, callback_data);
+		    id = swf_GetU16(tag);
+		}
+		if(flags & 4) { // hascolor
+		    if(num==1) swf_GetRGB(tag, NULL);
+		    else       swf_GetRGBA(tag, NULL);
+		}
+		if(flags & 2) { //has x offset
+		    swf_ResetReadBits(tag);
+		    swf_GetU16(tag);
+		}
+		if(flags & 1) { //has y offset
+		    swf_ResetReadBits(tag);
+		    swf_GetU16(tag);
+		}
+		if(flags & 8) { //has height
+		    swf_ResetReadBits(tag);
+		    swf_GetU16(tag);
+		}
+		
+		flags = swf_GetBits(tag, 8);
+		if(!flags) break;
+		swf_ResetReadBits(tag);
+		for(t=0;t<flags;t++) {
+		    swf_GetBits(tag, glyphbits);
+		    swf_GetBits(tag, advancebits);
+		}
+	    }
+	    break;
+	}
+	case ST_DEFINEFONTALIGNZONES:
+	case ST_DEFINESCALINGGRID:
+	case ST_GLYPHNAMES:
+	case ST_CSMTEXTSETTINGS:
+	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:
+	case ST_DEFINESHAPE4:
+	num++;
+	case ST_DEFINESHAPE3:
+	num++; //fallthrough
+	case ST_DEFINESHAPE2:
+	num++; //fallthrough
+	case ST_DEFINESHAPE: {
+	    int fillbits;
+	    int linebits;
+	    int id; 
+	    int numshapes = 1;
+	    int morph = 0;
+	    if(tag->id == ST_DEFINEMORPHSHAPE) {
+		numshapes = 2;
+		morph = 1;
+	    }
+
+	    id = swf_GetU16(tag); // id;
+	    swf_GetRect(tag, NULL); // shape bounds
+	    if(morph) {
+		swf_ResetReadBits(tag);
+		swf_GetRect(tag, NULL); // shape bounds2
+		if(num==4)
+		    swf_GetRect(tag, NULL); // edge bounds1
+	    }
+	    if(num>=4) {
+		swf_GetRect(tag, NULL); // edge bounds
+		swf_GetU8(tag); // flags, &1: contains scaling stroke, &2: contains non-scaling stroke
+	    }
+	    if(morph) {
+		swf_GetU32(tag); //offset to endedges
+	    }
+   
+	    DEBUG_ENUMERATE printf("Tag:%d Name:%s ID:%d\n", tag->id, swf_TagGetName(tag), id);
+
+	    enumerateUsedIDs_styles(tag, callback, callback_data, num, morph);
+	    DEBUG_ENUMERATE printf("-------\n");
+	    while(--numshapes>=0) /* morph shapes define two shapes */
+	    {
+		DEBUG_ENUMERATE printf("shape:%d\n", numshapes);
+		fillbits = swf_GetBits(tag, 4);
+		linebits = swf_GetBits(tag, 4);
+		DEBUG_ENUMERATE printf("%d %d\n", fillbits, linebits);
+		swf_ResetReadBits(tag);
+		while(1) {
+		    int flags;
+		    flags = swf_GetBits(tag, 1);
+		    if(!flags) { //style change
+			flags = swf_GetBits(tag, 5);
+			if(!flags)
+			    break;
+			if(flags&1) { //move
+			    int n = swf_GetBits(tag, 5); 
+			    int x,y;
+			    x = swf_GetBits(tag, n); //x
+			    y = swf_GetBits(tag, n); //y
+			    DEBUG_ENUMERATE printf("move %f %f\n",x/20.0,y/20.0);
+			}
+			if(flags&2) { //fill0
+			    int fill0;
+			    fill0 = swf_GetBits(tag, fillbits); 
+			    DEBUG_ENUMERATE printf("fill0 %d\n", fill0);
+			}
+			if(flags&4) { //fill1
+			    int fill1;
+			    fill1 = swf_GetBits(tag, fillbits); 
+			    DEBUG_ENUMERATE printf("fill1 %d\n", fill1);
+			}
+			if(flags&8) { //linestyle
+			    int line;
+			    line = swf_GetBits(tag, linebits); 
+			    DEBUG_ENUMERATE printf("linestyle %d\n",line);
+			}
+			if(flags&16) {
+			    DEBUG_ENUMERATE printf("more fillstyles\n");
+			    enumerateUsedIDs_styles(tag, callback, callback_data, num, 0);
+			    fillbits = swf_GetBits(tag, 4);
+			    linebits = swf_GetBits(tag, 4);
+			}
+		    } else {
+			flags = swf_GetBits(tag, 1);
+			if(flags) { //straight edge
+			    int n = swf_GetBits(tag, 4) + 2;
+			    if(swf_GetBits(tag, 1)) { //line flag
+				int x,y;
+				x = swf_GetSBits(tag, n); //delta x
+				y = swf_GetSBits(tag, n); //delta y
+				DEBUG_ENUMERATE printf("line %f %f\n",x/20.0,y/20.0);
+			    } else {
+				int v=swf_GetBits(tag, 1);
+				int d;
+				d = swf_GetSBits(tag, n); //vert/horz
+				DEBUG_ENUMERATE printf("%s %f\n",v?"vertical":"horizontal", d/20.0);
+			    }
+			} else { //curved edge
+			    int n = swf_GetBits(tag, 4) + 2;
+			    int x1,y1,x2,y2;
+			    x1 = swf_GetSBits(tag, n);
+			    y1 = swf_GetSBits(tag, n);
+			    x2 = swf_GetSBits(tag, n);
+			    y2 = swf_GetSBits(tag, n);
+			    DEBUG_ENUMERATE printf("curve %f %f %f %f\n", x1/20.0, y1/20.0, x2/20.0, y2/20.0);
+			}
+		    }
+		}
+	    }
+	}
+	break;
+	default:
+	break;
+    }
+}
+
+void callbackCount(TAG * t,int pos, void*ptr)
+{
+    (*(int*)ptr)++;
+    DEBUG_ENUMERATE printf("callback(%d) %d\n", pos, *(U16*)&t->data[pos]);
+}
+
+void callbackFillin(TAG * t,int pos, void*ptr)
+{
+    **(int**)ptr = pos;
+    (*(int**)ptr)++;
+    DEBUG_ENUMERATE printf("callback(%d) %d\n", pos, *(U16*)&t->data[pos]);
+}
+
+int swf_GetNumUsedIDs(TAG * t)
+{
+    int num = 0;
+    enumerateUsedIDs(t, 0, callbackCount, &num);
+    return num;
+}
+
+void swf_GetUsedIDs(TAG * t, int * positions)
+{
+    int * ptr = positions;
+    enumerateUsedIDs(t, 0, callbackFillin, &ptr);
+}
+
+void swf_Relocate (SWF*swf, char*bitmap)
+{
+    TAG*tag;
+    int slaveids[65536];
+    memset(slaveids, -1, sizeof(slaveids));
+    tag = swf->firstTag;
+    while(tag)
+    {
+	int num; 
+	int *ptr;
+	int t;
+
+	if(swf_isDefiningTag(tag))
+	{
+	    int newid;
+	    int id;
+	    
+	    id = swf_GetDefineID(tag); //own id
+
+	    if(!bitmap[id]) { //free
+		newid = id;
+	    }
+	    else {
+		newid = 0;
+		for (t=1;t<65536;t++)
+		{
+		    if(!bitmap[t])
+		    {
+			newid = t;
+			break;
+		    }
+		}
+	    }
+	    bitmap[newid] = 1;
+	    slaveids[id] = newid;
+
+	    swf_SetDefineID(tag, newid);
+	} 
+	
+	num = swf_GetNumUsedIDs(tag);
+	if(num) {
+	    ptr = rfx_alloc(sizeof(int)*num);
+	    swf_GetUsedIDs(tag, ptr);
+
+	    for(t=0;t<num;t++) {
+		int id = GET16(&tag->data[ptr[t]]);
+		if(slaveids[id]<0) {
+		    fprintf(stderr, "swf_Relocate: Mapping id (%d) never encountered before in %s\n", id,
+			    swf_TagGetName(tag));
+		    return ;
+		}
+		id = slaveids[id];
+		PUT16(&tag->data[ptr[t]], id);
+	    }
+	}
+	tag=tag->next;
+    }
+}
+
+/* untested */
+void swf_Relocate2(SWF*swf, int*id2id)
+{
+    TAG*tag;
+    tag = swf->firstTag;
+    while(tag) {
+	if(swf_isDefiningTag(tag)) {
+	    int id = swf_GetDefineID(tag);
+	    id = id2id[id];
+	    if(id>=0) {
+		swf_SetDefineID(tag, id);
+	    }
+	}
+	int num = swf_GetNumUsedIDs(tag);
+	if(num) {
+	    int *ptr;
+	    int t;
+	    ptr = rfx_alloc(sizeof(int)*num);
+	    swf_GetUsedIDs(tag, ptr);
+	    for(t=0;t<num;t++) {
+		int id = GET16(&tag->data[ptr[t]]);
+		id = id2id[id];
+		if(id>=0) {
+		    PUT16(&tag->data[ptr[t]], id);
+		}
+	    }
+	}
+    }
+}
+
+void swf_RelocateDepth(SWF*swf, char*bitmap)
+{
+    TAG*tag;
+    int nr;
+    tag = swf->firstTag;
+    for(nr=65535;nr>=0;nr--) {
+	if(bitmap[nr] != 0) 
+	    break;
+    }
+    // now nr is the highest used depth. So we start
+    // assigning depths at nr+1
+    nr++;
+
+    while(tag)
+    {
+	int depth;
+	/* TODO * clip depths 
+	        * sprites
+	 */
+	if(tag->id == ST_PLACEOBJECT2) {
+	    SWFPLACEOBJECT obj;
+	    swf_GetPlaceObject(tag, &obj);
+	    if(obj.clipdepth) {
+		int newdepth = obj.clipdepth+nr;
+		if(newdepth>65535) {
+		    fprintf(stderr, "Couldn't relocate depths: too large values\n");
+		    newdepth = 65535;
+		}
+		obj.clipdepth = newdepth;
+		swf_ResetTag(tag, ST_PLACEOBJECT2);
+		swf_SetPlaceObject(tag, &obj);
+	    }
+	    swf_PlaceObjectFree(&obj);
+	}
+
+	depth = swf_GetDepth(tag);
+	if(depth>=0) {
+	    int newdepth = depth+nr;
+	    if(newdepth>65535) {
+		fprintf(stderr, "Couldn't relocate depths: too large values\n");
+		newdepth = 65535;
+	    }
+	    swf_SetDepth(tag, newdepth);
+	}
+	tag=tag->next;
+    }
+}
+
+U8 swf_isShapeTag(TAG*tag)
+{
+    if(tag->id == ST_DEFINESHAPE ||
+       tag->id == ST_DEFINESHAPE2 ||
+       tag->id == ST_DEFINESHAPE3 ||
+       tag->id == ST_DEFINESHAPE4) 
+        return 1;
+    return 0;
+}
+
+U8 swf_isPlaceTag(TAG*tag)
+{
+    if(tag->id == ST_PLACEOBJECT ||
+       tag->id == ST_PLACEOBJECT2 ||
+       tag->id == ST_PLACEOBJECT3)
+        return 1;
+    return 0;
+}
+U8 swf_isTextTag(TAG*tag)
+{
+    if(tag->id == ST_DEFINETEXT ||
+       tag->id == ST_DEFINETEXT2)
+        return 1;
+    return 0;
+}
+
+U8 swf_isFontTag(TAG*tag)
+{
+    if(tag->id == ST_DEFINEFONT ||
+       tag->id == ST_DEFINEFONT2 ||
+       tag->id == ST_DEFINEFONTINFO)
+        return 1;
+    return 0;
+}
+
+U8  swf_isImageTag(TAG*tag)
+{
+    if(tag->id == ST_DEFINEBITSJPEG || 
+       tag->id == ST_DEFINEBITSJPEG2 || 
+       tag->id == ST_DEFINEBITSJPEG3 ||
+       tag->id == ST_DEFINEBITSLOSSLESS || 
+       tag->id == ST_DEFINEBITSLOSSLESS2)
+        return 1;
+    return 0;
+}
+
+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));
+    memset(&swf1, 0, sizeof(swf1));
+    memset(&swf2, 0, sizeof(swf2));
+
+    swf1.firstTag = list1;
+    swf_FoldAll(&swf1);
+    swf2.firstTag = list2;
+    swf_FoldAll(&swf2);
+
+    tag = list1;
+    while(tag) {
+	if(!swf_isDefiningTag(tag)) {
+	    int id = swf_GetDefineID(tag);
+	    bitmap[id] = 1;
+	}
+	if(tag->id == ST_PLACEOBJECT ||
+	   tag->id == ST_PLACEOBJECT2) {
+	    int depth = swf_GetDepth(tag);
+	    depthmap[depth] = 1;
+	}
+	if(tag->id == ST_REMOVEOBJECT ||
+	   tag->id == ST_REMOVEOBJECT2) {
+	    int depth = swf_GetDepth(tag);
+	    depthmap[depth] = 0;
+	}
+	tag = tag->next;
+	lasttag = tag;
+    }
+    swf_Relocate(&swf2, bitmap);
+    swf_RelocateDepth(&swf2, depthmap);
+    lasttag->next = swf2.firstTag;
+    swf2.firstTag->prev = lasttag;
+
+    return swf1.firstTag;
+}
+
+static int tagHash(TAG*tag)
+{
+    int t, h=0;
+    unsigned int a = 0x6b973e5a;
+    /* start at pos 2, as 0 and 1 are the id */
+    for(t=2;t<tag->len;t++) {
+        unsigned int b = a;
+        a >>= 8;
+        a += tag->data[t]*0xefbc35a5*b*(t+1);
+    }
+    return a&0x7fffffff; //always return positive number
+}
+
+void swf_Optimize(SWF*swf)
+{
+    const int hash_size = 131072;
+    char* dontremap = rfx_calloc(sizeof(char)*65536);
+    U16* remap = rfx_alloc(sizeof(U16)*65536);
+    TAG* id2tag = rfx_calloc(sizeof(TAG*)*65536);
+    TAG** hashmap = rfx_calloc(sizeof(TAG*)*hash_size);
+    TAG* tag;
+    int t;
+    for(t=0;t<65536;t++) {
+        remap[t] = t;
+    }
+
+    swf_FoldAll(swf);
+
+    tag = swf->firstTag;
+    while(tag) {
+        /* make sure we don't remap to this tag,
+           as it might have different "helper tags" 
+           FIXME: a better way would be to compare
+                  the helper tags, too.
+         */
+        if(swf_isPseudoDefiningTag(tag) &&
+           tag->id != ST_NAMECHARACTER) {
+            dontremap[swf_GetDefineID(tag)] = 1;
+        }
+        tag=tag->next;
+    }
+    tag = swf->firstTag;
+    while(tag) {
+        TAG*next = tag->next;
+
+        /* remap the tag */
+        int num = swf_GetNumUsedIDs(tag);
+        int*positions = rfx_alloc(sizeof(int)*num);
+        int t;
+        swf_GetUsedIDs(tag, positions);
+        for(t=0;t<num;t++) {
+            int id = GET16(&tag->data[positions[t]]);
+            id = remap[id];
+            PUT16(&tag->data[positions[t]], id);
+        }
+        rfx_free(positions);
+
+        /* now look for previous tags with the same
+           content */
+        if(swf_isDefiningTag(tag)) {
+            TAG*tag2;
+            int id = swf_GetDefineID(tag);
+            int hash = tagHash(tag);
+            int match=0;
+            if(!dontremap[id]) 
+            while((tag2 = hashmap[hash%hash_size])) {
+                if(tag2 != (TAG*)0 && tag->len == tag2->len) {
+		    if(memcmp(&tag->data[2],&tag2->data[2],tag->len-2) == 0) {
+			match = 1;
+			break;
+		    }
+                }
+                hash++;
+            }
+            if(!match) {
+                while(hashmap[hash%hash_size]) hash++;
+                hashmap[hash%hash_size] = tag;
+            } else {
+		/* we found two identical tags- remap one
+		   of them */
+                remap[id] = swf_GetDefineID(tag2);
+                swf_DeleteTag(tag);
+                if(tag == swf->firstTag)
+                    swf->firstTag = next;
+            }
+        } else if(swf_isPseudoDefiningTag(tag)) {
+            int id = swf_GetDefineID(tag);
+            if(remap[id]!=id) {
+                /* if this tag was remapped, we don't
+                   need the helper tag anymore. Discard
+                   it. */
+                swf_DeleteTag(tag);
+                if(tag == swf->firstTag)
+                    swf->firstTag = next;
+            }
+        }
+
+        tag = next;
+    }
+    
+    rfx_free(dontremap);
+    rfx_free(remap);
+    rfx_free(id2tag);
+    rfx_free(hashmap);
+}
+
+void swf_SetDefineBBox(TAG * tag, SRECT newbbox)
+{
+    U16 id = 0;
+    SRECT b1;
+    swf_SetTagPos(tag,0);
+
+    switch (swf_GetTagID(tag))
+    { 
+	case ST_DEFINESHAPE:
+	case ST_DEFINESHAPE2:
+	case ST_DEFINESHAPE3:
+	case ST_DEFINEEDITTEXT:
+	case ST_DEFINETEXT:
+	case ST_DEFINETEXT2:
+	case ST_DEFINEVIDEOSTREAM: {
+	      U32 after_bbox_offset = 0, len;
+	      U8*data;
+	      id = swf_GetU16(tag);
+	      swf_GetRect(tag, &b1);
+	      swf_ResetReadBits(tag);
+	      after_bbox_offset = tag->pos;
+	      len = tag->len - after_bbox_offset;
+	      data = malloc(len);
+	      memcpy(data, &tag->data[after_bbox_offset], len);
+	      tag->writeBit = 0;
+	      tag->len = 2;
+	      swf_SetRect(tag, &newbbox);
+	      swf_SetBlock(tag, data, len);
+	      free(data);
+	      tag->pos = tag->readBit = 0;
+
+	} break;
+	default:
+	    fprintf(stderr, "rfxswf: Tag %d (%s) has no bbox\n", tag->id, swf_TagGetName(tag));
+    }
+}
+
+RGBA swf_GetSWFBackgroundColor(SWF*swf)
+{
+    TAG*t=swf->firstTag;
+    RGBA color;
+    color.r = color.b = color.g = 0;
+    color.a = 255;
+    while(t) {
+	if(t->id == ST_SETBACKGROUNDCOLOR) {
+	    swf_SetTagPos(t, 0);
+	    color.r = swf_GetU8(t);
+	    color.g = swf_GetU8(t);
+	    color.b = swf_GetU8(t);
+	    break;
+	}
+	t=t->next;
+    }
+    return color;
+}
+