added swf_ShapeAddFillStyle2().
[swftools.git] / lib / modules / swfshape.c
index c09f30d..3c6c4b6 100644 (file)
-/* swfshape.c\r
-\r
-   shape functions\r
-      \r
-   Extension module for the rfxswf library.\r
-   Part of the swftools package.\r
-\r
-   Copyright (c) 2001 Rainer Böhme <rfxswf@reflex-studio.de>\r
\r
-   This file is distributed under the GPL, see file COPYING for details \r
-\r
-*/\r
-\r
-#define SF_MOVETO       0x01\r
-#define SF_FILL0        0x02\r
-#define SF_FILL1        0x04\r
-#define SF_LINE         0x08\r
-#define SF_NEWSTYLE     0x10\r
-\r
-#define FILL_SOLID      0x00\r
-#define FILL_LINEAR     0x10  // Gradient\r
-#define FILL_RADIAL     0x12\r
-#define FILL_TILED      0x40  // Bitmap\r
-#define FILL_CLIPPED    0x41\r
-\r
-void ShapeFree(LPSHAPE s)\r
-{ if (s)\r
-  { if (s->linestyle.data) free(s->linestyle.data);\r
-    s->linestyle.data = NULL;\r
-    s->linestyle.n    = 0;\r
-    if (s->fillstyle.data) free(s->fillstyle.data);\r
-    s->fillstyle.data = NULL;\r
-    s->fillstyle.n    = 0;\r
-    if (s->data) free(s->data);\r
-    s->data = NULL;\r
-  }\r
-  free(s);\r
-}\r
-\r
-int NewShape(LPSHAPE * s)\r
-{ LPSHAPE sh;\r
-  if (!s) return -1;\r
-  sh = (LPSHAPE)malloc(sizeof(SHAPE)); s[0] = sh;\r
-  if (sh) memset(sh,0x00,sizeof(SHAPE));\r
-  return sh?0:-1;\r
-}\r
-\r
-int GetSimpleShape(LPTAG t,LPSHAPE * s) // without Linestyle/Fillstyle Record\r
-{ LPSHAPE sh;\r
-  int bitl, len;\r
-  int end;\r
-  U32 pos;\r
-  \r
-  if (FAILED(NewShape(s))) return -1;\r
-  sh = s[0];\r
-\r
-  ResetBitmask(t); \r
-  sh->bits.fill = (U16)GetBits(t,4);\r
-  sh->bits.line = (U16)GetBits(t,4);\r
-  bitl = 0; end = 0; pos = GetTagPos(t);\r
-\r
-  while (!end)\r
-  { int edge = GetBits(t,1); bitl+=1;\r
-    if (edge)\r
-    { bitl+=1;\r
-      if (GetBits(t,1))                 // Line\r
-      { U16 nbits = GetBits(t,4)+2;\r
-        bitl+=5;\r
-\r
-        if (GetBits(t,1))               // x/y Line\r
-        { GetBits(t,nbits);\r
-          GetBits(t,nbits);\r
-          bitl+=nbits*2;\r
-        }\r
-        else                            // hline/vline\r
-        { GetBits(t,nbits+1);\r
-          bitl+=nbits+1;\r
-        }\r
-      }\r
-      else                              // Curve\r
-      { U16 nbits = GetBits(t,4)+2;\r
-        bitl+=4;\r
-\r
-        GetBits(t,nbits);\r
-        GetBits(t,nbits);\r
-        GetBits(t,nbits);\r
-        GetBits(t,nbits);\r
-\r
-        bitl+=4*nbits;\r
-      }\r
-    }\r
-    else\r
-    { U16 flags = GetBits(t,5); bitl+=5;\r
-      if (flags)\r
-      {\r
-        if (flags&SF_MOVETO)\r
-        { U16 nbits = GetBits(t,5); bitl+=5;\r
-          GetBits(t,nbits);\r
-          GetBits(t,nbits);\r
-          bitl+=2*nbits;\r
-        }\r
-        \r
-        if (flags&SF_FILL0)\r
-        { GetBits(t,sh->bits.fill);\r
-          bitl+=sh->bits.fill;\r
-        }\r
-        \r
-        if (flags&SF_FILL1)\r
-        { GetBits(t,sh->bits.fill);\r
-          bitl+=sh->bits.fill;\r
-        }\r
-\r
-        if (flags&SF_LINE)\r
-        { GetBits(t,sh->bits.line);\r
-          bitl+=sh->bits.line;\r
-        }\r
-\r
-        if (flags&SF_NEWSTYLE)\r
-        { fprintf(stderr,"Can't process extended styles in shape.\n");\r
-        }\r
-      }\r
-      else end = 1;\r
-    }\r
-  }\r
-  SetTagPos(t,pos);\r
-  len = (bitl+7)/8;\r
-  \r
-  if (sh->data) free(sh->data);\r
-  sh->data = (U8*)malloc(len);\r
-  \r
-  if (sh->data)\r
-  { sh->bitlen = bitl;\r
-    GetBlock(t,sh->data,len);\r
-  }\r
-  else return -1;\r
-  \r
-  return len;\r
-}\r
-\r
-int SetSimpleShape(LPTAG t,LPSHAPE s) // without Linestyle/Fillstyle Record\r
-{ int l;\r
-\r
-  if (!s) return -1;\r
-  l = (s->bitlen+7)/8;\r
-\r
-  if (t)\r
-  { ResetBitcount(t);\r
-\r
-    SetBits(t,s->bits.fill,4);\r
-    SetBits(t,s->bits.line,4);\r
-    SetBlock(t,s->data,l);\r
-\r
-    ResetBitcount(t);\r
-  }\r
-  return l+1;\r
-}\r
-\r
-int SetFillStyle(LPTAG t,LPFILLSTYLE f)\r
-{ if ((!t)||(!f)) return -1;\r
-  SetU8(t,f->type);\r
-  \r
-  // no gradients yet!\r
-  \r
-  switch (f->type)\r
-  { case FILL_SOLID:\r
-      if (GetTagID(t)!=ST_DEFINESHAPE3) SetRGB(t,&f->color);\r
-      else SetRGBA(t,&f->color);\r
-      break;\r
-\r
-    case FILL_TILED:\r
-    case FILL_CLIPPED:\r
-      SetU16(t,f->id_bitmap);\r
-      SetMatrix(t,&f->m);\r
-      break;\r
-  }\r
-  \r
-  return 0;\r
-}\r
-\r
-int SetLineStyle(LPTAG t,LPLINESTYLE l)\r
-{ if ((!l)||(!t)) return -1;\r
-  SetU16(t,l->width);\r
-\r
-  if (GetTagID(t)!=ST_DEFINESHAPE3) SetRGB(t,&l->color);\r
-  else SetRGBA(t,&l->color);\r
-  \r
-  return 0;\r
-}\r
-\r
-int SetShapeStyleCount(LPTAG t,U16 n)\r
-{ if (n>254)\r
-  { SetU8(t,0xff);\r
-    SetU16(t,n);\r
-    return 3;\r
-  }\r
-  else\r
-  { SetU8(t,n);\r
-    return 1;\r
-  }\r
-}\r
-\r
-int SetShapeStyles(LPTAG t,LPSHAPE s)\r
-{ int i,l;\r
-  if (!s) return -1;\r
-\r
-  l = 0;\r
-  l += SetShapeStyleCount(t,s->fillstyle.n);\r
-\r
-  for (i=0;i<s->fillstyle.n;i++)\r
-    l+=SetFillStyle(t,&s->fillstyle.data[i]);\r
-\r
-  l += SetShapeStyleCount(t,s->linestyle.n);\r
-\r
-  for (i=0;i<s->linestyle.n;i++)\r
-    l+=SetLineStyle(t,&s->linestyle.data[i]);\r
-\r
-  return l;\r
-}\r
-\r
-int ShapeCountBits(LPSHAPE s,U8 * fbits,U8 * lbits)\r
-{ if (!s) return -1;\r
-    \r
-  s->bits.fill = CountBits(s->fillstyle.n,0);\r
-  s->bits.line = CountBits(s->linestyle.n,0);\r
-\r
-  if (fbits) fbits[0] = s->bits.fill;\r
-  if (lbits) lbits[0] = s->bits.line;\r
-  \r
-  return 0;    \r
-}\r
-\r
-int SetShapeBits(LPTAG t,LPSHAPE s)\r
-{ if ((!t)||(!s)) return -1;\r
-  ResetBitcount(t);\r
-  SetBits(t,s->bits.fill,4);\r
-  SetBits(t,s->bits.line,4);\r
-  return 0;\r
-}\r
-\r
-int SetShapeHeader(LPTAG t,LPSHAPE s)\r
-{ int res;\r
-  res = SetShapeStyles(t,s);\r
-  if (res>=0) res = ShapeCountBits(s,NULL,NULL);\r
-  if (res>=0) res = SetShapeBits(t,s);\r
-  return res;\r
-}\r
-\r
-int ShapeExport(int handle,LPSHAPE s)  // without Linestyle/Fillstyle Record\r
-{ int l;\r
-  if (!s) return 0;\r
-\r
-  l = sizeof(SHAPE);\r
-\r
-  if (handle>=0)\r
-    if (write(handle,s,sizeof(SHAPE))!=sizeof(SHAPE)) return -1;\r
-\r
-  // Fillstyle, Linestyle ...\r
-\r
-  if (s->data)\r
-  { int ll = (s->bitlen+7)/8;\r
-    l+=ll;\r
-    if (handle>=0)\r
-      if (write(handle,s->data,ll)!=ll) return -1;\r
-  }\r
-\r
-  return l;\r
-}\r
-\r
-int ShapeImport(int handle,LPSHAPE * shape)\r
-{ LPSHAPE s;\r
-\r
-  if (handle<0) return -1;\r
-\r
-  s = (LPSHAPE)malloc(sizeof(SHAPE)); shape[0] = s;\r
-  if (!s) return -1;\r
-\r
-  if (read(handle,s,sizeof(SHAPE))!=sizeof(SHAPE))\r
-  { shape[0] = NULL;\r
-    free(s);\r
-    return -1;\r
-  }\r
-\r
-  if (s->data)\r
-  { int ll = (s->bitlen+7)/8;\r
-    s->data = (U8*)malloc(ll);\r
-    if (!s->data)\r
-    { shape[0] = NULL;\r
-      free(s);\r
-      return -1;\r
-    }\r
-    if (read(handle,s->data,ll)!=ll)\r
-    { free(s->data);\r
-      free(s);\r
-      shape[0] = NULL;\r
-      return -1;\r
-    }\r
-  }\r
-\r
-  return 0;\r
-}\r
-\r
-int ShapeAddFillStyle(LPSHAPE s,U8 type,LPMATRIX m,LPRGBA color,U16 id_bitmap)\r
-{ RGBA def_c;\r
-  MATRIX def_m;    \r
-\r
-  // handle defaults\r
-  \r
-  if (!s) return -1;\r
-  if (!color)\r
-  { color = &def_c;\r
-    def_c.a = 0xff;\r
-    def_c.r = def_c.g = def_c.b = 0;\r
-  }\r
-  if (!m)\r
-  { m = &def_m;\r
-    GetMatrix(NULL,m);\r
-  }\r
-\r
-  // handle memory\r
-  \r
-  if (s->fillstyle.data)\r
-  { LPFILLSTYLE new = (LPFILLSTYLE)realloc(s->fillstyle.data,(s->fillstyle.n+1)*sizeof(FILLSTYLE));\r
-    if (!new) return -1;\r
-    s->fillstyle.data = new;\r
-  }\r
-  else\r
-  { s->fillstyle.data = (LPFILLSTYLE)malloc(sizeof(FILLSTYLE));\r
-    s->fillstyle.n = 0;\r
-    if (!s->fillstyle.data) return -1;\r
-  }\r
-\r
-  // set fillstyle  (no gradients yet!)\r
-  \r
-  s->fillstyle.data[s->fillstyle.n].type = type; \r
-  s->fillstyle.data[s->fillstyle.n].id_bitmap = id_bitmap;\r
-  memcpy(&s->fillstyle.data[s->fillstyle.n].m,m,sizeof(MATRIX));\r
-  memcpy(&s->fillstyle.data[s->fillstyle.n].color,color,sizeof(RGBA));\r
-          \r
-  return (++s->fillstyle.n);\r
-}\r
-\r
-int ShapeAddSolidFillStyle(LPSHAPE s,LPRGBA color)\r
-{ return ShapeAddFillStyle(s,FILL_SOLID,NULL,color,0);\r
-}\r
-\r
-int ShapeAddBitmapFillStyle(LPSHAPE s,LPMATRIX m,U16 id_bitmap,int clip)\r
-{ return ShapeAddFillStyle(s,clip?FILL_CLIPPED:FILL_TILED,m,NULL,id_bitmap);\r
-}\r
-\r
-int ShapeAddLineStyle(LPSHAPE s,U16 width,LPRGBA color)\r
-{ RGBA def;\r
-  if (!s) return -1;\r
-  if (!color)\r
-  { color = &def;\r
-    def.a = 0xff;\r
-    def.r = def.g = def.b = 0; \r
-  }\r
-  if (s->linestyle.data)\r
-  { LPLINESTYLE new = (LPLINESTYLE)realloc(s->linestyle.data,(s->linestyle.n+1)*sizeof(LINESTYLE));\r
-    if (!new) return -1;\r
-    s->linestyle.data = new;\r
-  }\r
-  else\r
-  { s->linestyle.data = (LPLINESTYLE)malloc(sizeof(LINESTYLE));\r
-    s->linestyle.n = 0;\r
-    if (!s->linestyle.data) return -1;\r
-  }\r
-  \r
-  s->linestyle.data[s->linestyle.n].width = width;\r
-  memcpy(&s->linestyle.data[s->linestyle.n].color,color,sizeof(RGBA));\r
-\r
-  return (++s->linestyle.n);\r
-}\r
-\r
-int ShapeSetMove(LPTAG t,LPSHAPE s,S32 x,S32 y)\r
-{ U8 b;\r
-  if (!t) return -1;\r
-  SetBits(t,0,1);\r
-  SetBits(t,SF_MOVETO,5);\r
-  \r
-  b = CountBits(x,0);\r
-  b = CountBits(y,b);\r
-  \r
-  SetBits(t,b,5);\r
-  SetBits(t,x,b);\r
-  SetBits(t,y,b);\r
-\r
-  if (s)\r
-  { s->px = x;\r
-    s->py = y;\r
-  }\r
-  return 0;\r
-}\r
-\r
-int ShapeSetStyle(LPTAG t,LPSHAPE s,U16 line,U16 fill0,U16 fill1)\r
-{ if ((!t)||(!s)) return -1;\r
-    \r
-  SetBits(t,0,1);\r
-  SetBits(t,(line?SF_LINE:0)|(fill0?SF_FILL0:0)|(fill1?SF_FILL1:0),5);\r
-\r
-  if (fill0) SetBits(t,fill0,s->bits.fill);\r
-  if (fill1) SetBits(t,fill1,s->bits.fill);\r
-  if (line)  SetBits(t,line ,s->bits.line);\r
-  \r
-  return 0;\r
-}\r
-\r
-/* TODO: sometimes we want to set fillstyle 0, as that's the empty fill\r
-   used for line drawings. At the moment, we can't, as 0 fill be considered\r
-   nonexistent and therefore not set.\r
-   these defines are a workaround (they also reduce the maximal number of\r
-   fill styles to 32768)\r
- */\r
-#define FILL_RESET 0x8000\r
-#define LINE_RESET 0x8000\r
-int ShapeSetAll(LPTAG t,LPSHAPE s,S32 x,S32 y,U16 line,U16 fill0,U16 fill1)\r
-{ U8 b;\r
-  if ((!t)||(!s)) return -1;\r
-\r
-  SetBits(t,0,1);\r
-  SetBits(t,SF_MOVETO|(line?SF_LINE:0)|(fill0?SF_FILL0:0)|(fill1?SF_FILL1:0),5);\r
-\r
-  b = CountBits(x,0);\r
-  b = CountBits(y,b);\r
-  SetBits(t,b,5);\r
-  SetBits(t,x,b);\r
-  SetBits(t,y,b);\r
-  s->px = x;\r
-  s->py = y;\r
-\r
-  if (fill0) SetBits(t,fill0,s->bits.fill);\r
-  if (fill1) SetBits(t,fill1,s->bits.fill);\r
-  if (line)  SetBits(t,line ,s->bits.line);\r
-  \r
-  return 0;\r
-}\r
-\r
-int ShapeSetEnd(LPTAG t)\r
-{ if (!t) return -1;\r
-  SetBits(t,0,6);\r
-  return 0;\r
-}\r
-\r
-int ShapeSetLine(LPTAG t,LPSHAPE s,S32 x,S32 y)\r
-{ U8 b;\r
-  if (!t) return -1;\r
-  SetBits(t,3,2); // Straight Edge\r
-\r
-  if ((!s)||(s->px!=x)||(s->py!=y))\r
-  { b = CountBits(x,2);\r
-    b = CountBits(y,b);\r
-    SetBits(t,b-2,4);\r
-    SetBits(t,1,1);\r
-    SetBits(t,x,b);\r
-    SetBits(t,y,b);\r
-    if (s)\r
-    { s->px += x;\r
-      s->py += y;\r
-    }\r
-    return 0;\r
-  }\r
-\r
-  if (s->px==x)\r
-  { b = CountBits(y,2);\r
-    SetBits(t,b-2,4);\r
-    SetBits(t,1,2);\r
-    SetBits(t,y,b);\r
-    s->py += y;\r
-  }\r
-  else\r
-  { b = CountBits(x,2);\r
-    SetBits(t,b-2,4);\r
-    SetBits(t,0,2);\r
-    SetBits(t,x,b);\r
-    s->px += x;\r
-  }\r
-  return 0;\r
-}\r
-\r
-int ShapeSetCurve(LPTAG t,LPSHAPE s,S32 x,S32 y,S32 ax,S32 ay)\r
-{ U8 b;\r
-  if (!t) return -1;\r
-\r
-  SetBits(t,2,2);\r
-\r
-  b = CountBits(ax,2);\r
-  b = CountBits(ay,b);\r
-  b = CountBits(x,b);\r
-  b = CountBits(y,b);\r
-\r
-  SetBits(t,b-2,4);\r
-  SetBits(t,x,b);\r
-  SetBits(t,y,b);\r
-  SetBits(t,ax,b);\r
-  SetBits(t,ay,b);\r
-\r
-  if (s)\r
-  { s->px += x+ax;\r
-    s->py += y+ay;\r
-  }\r
-  return 0;\r
-}\r
-\r
-int ShapeSetCircle(LPTAG t,LPSHAPE s,S32 x,S32 y,S32 rx,S32 ry)\r
-{ double C1 = 0.2930;    \r
-  double C2 = 0.4140;   \r
-  double begin = 0.7070; \r
-\r
-  if (!t) return -1;\r
-  \r
-  ShapeSetMove(t,s,x+begin*rx,y+begin*ry);\r
-  ShapeSetCurve(t,s, -C1*rx,  C1*ry, -C2*rx,      0);\r
-  ShapeSetCurve(t,s, -C2*rx,      0, -C1*rx, -C1*ry);\r
-  ShapeSetCurve(t,s, -C1*rx, -C1*ry,      0, -C2*ry);\r
-  ShapeSetCurve(t,s,      0, -C2*ry,  C1*rx, -C1*ry);\r
-  ShapeSetCurve(t,s,  C1*rx, -C1*ry,  C2*rx,      0);\r
-  ShapeSetCurve(t,s,  C2*rx,      0,  C1*rx,  C1*ry);\r
-  ShapeSetCurve(t,s,  C1*rx,  C1*ry,      0,  C2*ry);\r
-  ShapeSetCurve(t,s,      0,  C2*ry, -C1*rx,  C1*ry);\r
-  \r
-  return 0;\r
-}\r
-\r
+/* swfshape.c
+
+   shape functions
+      
+   Extension module for the rfxswf library.
+   Part of the swftools package.
+
+   Copyright (c) 2001 Rainer Böhme <rfxswf@reflex-studio.de>
+   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 */
+
+#define SF_MOVETO       0x01
+#define SF_FILL0        0x02
+#define SF_FILL1        0x04
+#define SF_LINE         0x08
+#define SF_NEWSTYLE     0x10
+
+void swf_ShapeFree(SHAPE * s)
+{ 
+    if(!s)
+        return;
+    if (s->linestyle.data) rfx_free(s->linestyle.data);
+    s->linestyle.data = NULL;
+    s->linestyle.n    = 0;
+    if (s->fillstyle.data) rfx_free(s->fillstyle.data);
+    s->fillstyle.data = NULL;
+    s->fillstyle.n    = 0;
+    if (s->data) rfx_free(s->data);
+    s->data = NULL;
+    rfx_free(s);
+}
+
+int swf_ShapeNew(SHAPE * * s)
+{ 
+    SHAPE * sh;
+    if (!s) return -1;
+    sh = (SHAPE *)rfx_calloc(sizeof(SHAPE)); 
+    *s = sh;
+    return 0;
+}
+
+int swf_GetSimpleShape(TAG * t,SHAPE * * s) // without Linestyle/Fillstyle Record
+{ SHAPE * sh;
+  int bitl, len;
+  int end;
+  U32 pos;
+  
+  if (FAILED(swf_ShapeNew(s))) return -1;
+  sh = s[0];
+
+  swf_ResetReadBits(t); 
+  sh->bits.fill = (U16)swf_GetBits(t,4);
+  sh->bits.line = (U16)swf_GetBits(t,4);
+  bitl = 0; end = 0; pos = swf_GetTagPos(t);
+
+  while (!end)
+  { int edge = swf_GetBits(t,1); bitl+=1;
+    if (edge)
+    { bitl+=1;
+      if (swf_GetBits(t,1))                 // Line
+      { U16 nbits = swf_GetBits(t,4)+2;
+        bitl+=5;
+
+        if (swf_GetBits(t,1))               // x/y Line
+        { swf_GetBits(t,nbits);
+          swf_GetBits(t,nbits);
+          bitl+=nbits*2;
+        }
+        else                            // hline/vline
+        { swf_GetBits(t,nbits+1);
+          bitl+=nbits+1;
+        }
+      }
+      else                              // Curve
+      { U16 nbits = swf_GetBits(t,4)+2;
+        bitl+=4;
+
+        swf_GetBits(t,nbits);
+        swf_GetBits(t,nbits);
+        swf_GetBits(t,nbits);
+        swf_GetBits(t,nbits);
+
+        bitl+=4*nbits;
+      }
+    }
+    else
+    { U16 flags = swf_GetBits(t,5); bitl+=5;
+      if (flags)
+      {
+        if (flags&SF_MOVETO)
+        { U16 nbits = swf_GetBits(t,5); bitl+=5;
+          swf_GetBits(t,nbits);
+          swf_GetBits(t,nbits);
+          bitl+=2*nbits;
+        }
+        
+        if (flags&SF_FILL0)
+        { swf_GetBits(t,sh->bits.fill);
+          bitl+=sh->bits.fill;
+        }
+        
+        if (flags&SF_FILL1)
+        { swf_GetBits(t,sh->bits.fill);
+          bitl+=sh->bits.fill;
+        }
+
+        if (flags&SF_LINE)
+        { swf_GetBits(t,sh->bits.line);
+          bitl+=sh->bits.line;
+        }
+
+        if (flags&SF_NEWSTYLE)
+        { fprintf(stderr,"RFXSWF: Can't process extended styles in shape.\n");
+        }
+      }
+      else end = 1;
+    }
+  }
+  swf_SetTagPos(t,pos);
+  len = (bitl+7)/8;
+  
+  if (sh->data) rfx_free(sh->data);
+  sh->data = (U8*)rfx_alloc(len);
+  
+  if (sh->data)
+  { sh->bitlen = bitl;
+    swf_GetBlock(t,sh->data,len);
+  }
+  else return -1;
+  
+  return len;
+}
+
+int swf_SetSimpleShape(TAG * t,SHAPE * s) // without Linestyle/Fillstyle Record
+{ int l;
+
+  if (!s) return -1;
+  l = (s->bitlen+7)/8;
+
+  if (t)
+  { swf_ResetWriteBits(t);
+
+    swf_SetBits(t,s->bits.fill,4);
+    swf_SetBits(t,s->bits.line,4);
+    swf_SetBlock(t,s->data,l);
+
+    swf_ResetWriteBits(t);
+  }
+  return l+1;
+}
+
+int swf_SetFillStyle(TAG * t,FILLSTYLE * f)
+{ if ((!t)||(!f)) return -1;
+  swf_SetU8(t,f->type);
+  
+  switch (f->type)
+  { case FILL_SOLID:
+      if (swf_GetTagID(t)!=ST_DEFINESHAPE3) swf_SetRGB(t,&f->color);
+      else swf_SetRGBA(t,&f->color);
+      break;
+
+    case FILL_TILED:
+    case FILL_CLIPPED:
+      swf_SetU16(t,f->id_bitmap);
+      swf_SetMatrix(t,&f->m);
+      break;
+    case FILL_LINEAR:
+    case FILL_RADIAL:
+      swf_SetMatrix(t,&f->m);
+      swf_SetGradient(t,&f->gradient,/*alpha?*/t->id==ST_DEFINESHAPE3?1:0);
+      break;
+  }
+  
+  return 0;
+}
+
+int swf_SetLineStyle(TAG * t,LINESTYLE * l)
+{ if ((!l)||(!t)) return -1;
+  swf_SetU16(t,l->width);
+
+  if (swf_GetTagID(t)!=ST_DEFINESHAPE3) swf_SetRGB(t,&l->color);
+  else swf_SetRGBA(t,&l->color);
+  
+  return 0;
+}
+
+int swf_SetShapeStyleCount(TAG * t,U16 n)
+{ if (n>254)
+  { swf_SetU8(t,0xff);
+    swf_SetU16(t,n);
+    return 3;
+  }
+  else
+  { swf_SetU8(t,n);
+    return 1;
+  }
+}
+
+int swf_SetShapeStyles(TAG * t,SHAPE * s)
+{ int i,l;
+  if (!s) return -1;
+
+  l = 0;
+  l += swf_SetShapeStyleCount(t,s->fillstyle.n);
+
+  for (i=0;i<s->fillstyle.n;i++)
+    l+=swf_SetFillStyle(t,&s->fillstyle.data[i]);
+
+  l += swf_SetShapeStyleCount(t,s->linestyle.n);
+
+  for (i=0;i<s->linestyle.n;i++)
+    l+=swf_SetLineStyle(t,&s->linestyle.data[i]);
+
+  return l;
+}
+
+int swf_ShapeCountBits(SHAPE * s,U8 * fbits,U8 * lbits)
+{ if (!s) return -1;
+  s->bits.fill = swf_CountUBits(s->fillstyle.n, 0);
+  s->bits.line = swf_CountUBits(s->linestyle.n, 0);
+  if (fbits) fbits[0] = s->bits.fill;
+  if (lbits) lbits[0] = s->bits.line;
+  return 0;    
+}
+
+int swf_SetShapeBits(TAG * t,SHAPE * s)
+{ if ((!t)||(!s)) return -1;
+  swf_ResetWriteBits(t);
+  swf_SetBits(t,s->bits.fill,4);
+  swf_SetBits(t,s->bits.line,4);
+  return 0;
+}
+
+int swf_SetShapeHeader(TAG * t,SHAPE * s)
+{ int res;
+  res = swf_SetShapeStyles(t,s);
+  if (res>=0) res = swf_ShapeCountBits(s,NULL,NULL);
+  if (res>=0) res = swf_SetShapeBits(t,s);
+  return res;
+}
+
+int swf_ShapeAddFillStyle(SHAPE * s,U8 type,MATRIX * m,RGBA * color,U16 id_bitmap, GRADIENT*gradient)
+{ RGBA def_c;
+  MATRIX def_m;    
+  GRADIENT def_g;
+
+  // handle defaults
+  
+  if (!s) return -1;
+  if (!color)
+  { color = &def_c;
+    def_c.a = 0xff;
+    def_c.r = def_c.g = def_c.b = 0;
+  }
+  if (!m)
+  { m = &def_m;
+    swf_GetMatrix(NULL,m);
+  }
+  if(!gradient)
+  {
+    gradient = &def_g;
+    swf_GetGradient(NULL, gradient, 1);
+  }
+
+  // handle memory
+  
+  if (s->fillstyle.data)
+  { FILLSTYLE * new = (FILLSTYLE *)rfx_realloc(s->fillstyle.data,(s->fillstyle.n+1)*sizeof(FILLSTYLE));
+    if (!new) return -1;
+    s->fillstyle.data = new;
+  }
+  else
+  { s->fillstyle.data = (FILLSTYLE *)rfx_alloc(sizeof(FILLSTYLE));
+    s->fillstyle.n = 0;
+    if (!s->fillstyle.data) return -1;
+  }
+
+  // set fillstyle
+  
+  s->fillstyle.data[s->fillstyle.n].type = type; 
+  s->fillstyle.data[s->fillstyle.n].id_bitmap = id_bitmap;
+  memcpy(&s->fillstyle.data[s->fillstyle.n].m,m,sizeof(MATRIX));
+  memcpy(&s->fillstyle.data[s->fillstyle.n].color,color,sizeof(RGBA));
+  memcpy(&s->fillstyle.data[s->fillstyle.n].gradient,gradient,sizeof(GRADIENT));
+          
+  return (++s->fillstyle.n);
+}
+int swf_ShapeAddFillStyle2(SHAPE * s,FILLSTYLE*fs)
+{
+    return swf_ShapeAddFillStyle(s, fs->type, &fs->m, &fs->color, fs->id_bitmap, &fs->gradient);
+}
+
+int swf_ShapeAddSolidFillStyle(SHAPE * s,RGBA * color)
+{ return swf_ShapeAddFillStyle(s,FILL_SOLID,NULL,color,0,0);
+}
+
+int swf_ShapeAddBitmapFillStyle(SHAPE * s,MATRIX * m,U16 id_bitmap,int clip)
+{ return swf_ShapeAddFillStyle(s,clip?FILL_CLIPPED:FILL_TILED,m,NULL,id_bitmap,0);
+}
+
+int swf_ShapeAddGradientFillStyle(SHAPE * s,MATRIX * m,GRADIENT* gradient,int radial)
+{ return swf_ShapeAddFillStyle(s,radial?FILL_RADIAL:FILL_LINEAR,m,NULL,0,gradient);
+}
+
+int swf_ShapeAddLineStyle(SHAPE * s,U16 width,RGBA * color)
+{ RGBA def;
+  if (!s) return -1;
+  if (!color)
+  { color = &def;
+    def.a = 0xff;
+    def.r = def.g = def.b = 0; 
+  }
+  if (s->linestyle.data)
+  { LINESTYLE * new = (LINESTYLE *)rfx_realloc(s->linestyle.data,(s->linestyle.n+1)*sizeof(LINESTYLE));
+    if (!new) return -1;
+    s->linestyle.data = new;
+  }
+  else
+  { s->linestyle.data = (LINESTYLE *)rfx_alloc(sizeof(LINESTYLE));
+    s->linestyle.n = 0;
+    if (!s->linestyle.data) return -1;
+  }
+  
+  s->linestyle.data[s->linestyle.n].width = width;
+  memcpy(&s->linestyle.data[s->linestyle.n].color,color,sizeof(RGBA));
+
+  return (++s->linestyle.n);
+}
+
+int swf_ShapeSetMove(TAG * t,SHAPE * s,S32 x,S32 y)
+{ U8 b;
+  if (!t) return -1;
+  swf_SetBits(t,0,1);
+  swf_SetBits(t,SF_MOVETO,5);
+  
+  b = swf_CountBits(x,0);
+  b = swf_CountBits(y,b);
+  
+  swf_SetBits(t,b,5);
+  swf_SetBits(t,x,b);
+  swf_SetBits(t,y,b);
+
+  return 0;
+}
+
+int swf_ShapeSetStyle(TAG * t,SHAPE * s,int line,int fill0,int fill1)
+{ if ((!t)||(!s)) return -1;
+    
+  swf_SetBits(t,0,1);
+  swf_SetBits(t,(line?SF_LINE:0)|(fill0?SF_FILL0:0)|(fill1?SF_FILL1:0),5);
+
+  if (fill0) swf_SetBits(t,fill0,s->bits.fill);
+  if (fill1) swf_SetBits(t,fill1,s->bits.fill);
+  if (line)  swf_SetBits(t,line ,s->bits.line);
+  
+  return 0;
+}
+
+/* TODO: sometimes we want to set fillstyle 0, as that's the empty fill
+   used for line drawings. At the moment, we can't, as 0 fill be considered
+   nonexistent and therefore not set.
+   these defines are a workaround (they also reduce the maximal number of
+   fill styles to 32768)
+ */
+#define UNDEFINED_COORD 0x7fffffff
+
+int swf_ShapeSetAll(TAG * t,SHAPE * s,S32 x,S32 y,int line,int fill0,int fill1)
+{ U8 b;
+  U8 hasmove = 0;
+  if ((!t)||(!s)) return -1;
+
+  if(x!=UNDEFINED_COORD || y!=UNDEFINED_COORD)
+      hasmove=1;
+
+  swf_SetBits(t,0,1);
+  swf_SetBits(t,(hasmove?SF_MOVETO:0)|(line?SF_LINE:0)|(fill0?SF_FILL0:0)|(fill1?SF_FILL1:0),5);
+
+  if(hasmove) {
+    b = swf_CountBits(x,0);
+    b = swf_CountBits(y,b);
+    swf_SetBits(t,b,5);
+    swf_SetBits(t,x,b);
+    swf_SetBits(t,y,b);
+  }
+
+  if (fill0) swf_SetBits(t,fill0,s->bits.fill);
+  if (fill1) swf_SetBits(t,fill1,s->bits.fill);
+  if (line)  swf_SetBits(t,line ,s->bits.line);
+  
+  return 0;
+}
+
+int swf_ShapeSetEnd(TAG * t)
+{ if (!t) return -1;
+  swf_SetBits(t,0,6);
+  swf_ResetWriteBits(t);
+  return 0;
+}
+
+int swf_ShapeSetLine(TAG * t,SHAPE * s,S32 x,S32 y)
+{ 
+    U8 b;
+    if (!t) return -1;
+   
+    b = swf_CountBits(x,2);
+    b = swf_CountBits(y,b);
+    if (b<2) b=2;
+    if(b >= 18) {
+        if(b >= 18 + 4) {
+            /* do not split into more than 16 segments. If the line is *that* long, something's broken */
+            fprintf(stderr, "Warning: Line to %.2f,%.2f is too long\n", (double)x,(double)y);
+            return -1;
+        } else {
+            /* split line */
+            int x1,y1,x2,y2;
+            if(x>=0) { x1 = x/2;x2 = (x+1)/2;} 
+            else     { x1 = x/2;x2 = (x-1)/2;}
+            if(y>=0) { y1 = y/2;y2 = (y+1)/2;} 
+            else     { y1 = y/2;y2 = (y-1)/2;}
+            swf_ShapeSetLine(t, s, x1,y1);
+            swf_ShapeSetLine(t, s, x2,y2);
+            return 0;
+        }
+    }
+
+    if(x!=0 && y!=0) { //(!s)||((x!=0)&&(y!=0)))
+        swf_SetBits(t,3,2); // Straight Edge
+        swf_SetBits(t, b-2, 4); //Number of Bits in x/y
+        swf_SetBits(t,1,1); // Diagonal
+        swf_SetBits(t,x,b);
+        swf_SetBits(t,y,b);
+    } else if (x==0) {
+        swf_SetBits(t,3,2); // Straight Edge
+        swf_SetBits(t, b-2, 4); //Number of Bits in y
+        swf_SetBits(t,1,2); // Vertical
+        swf_SetBits(t,y,b);
+    } else {
+        swf_SetBits(t,3,2); // Straight Edge
+        swf_SetBits(t, b-2, 4); //Number of Bits in x
+        swf_SetBits(t,0,2); // Horizontal
+        swf_SetBits(t,x,b);
+    }
+    return 0;
+}
+
+int swf_ShapeSetCurve(TAG * t,SHAPE * s,S32 x,S32 y,S32 ax,S32 ay)
+{ 
+    U8 b;
+    if (!t) return -1;
+
+    b = swf_CountBits(ax,2);
+    b = swf_CountBits(ay,b);
+    b = swf_CountBits(x,b);
+    b = swf_CountBits(y,b);
+
+    if(b >= 18) {
+          fprintf(stderr, "Bit overflow in swf_ShapeSetCurve- %d (%d,%d,%d,%d)\n", b, ax,ay,x,y);
+          b = 17;
+    }
+
+    swf_SetBits(t,2,2);
+    swf_SetBits(t,b-2,4);
+    swf_SetBits(t,x,b);
+    swf_SetBits(t,y,b);
+    swf_SetBits(t,ax,b);
+    swf_SetBits(t,ay,b);
+    return 0;
+}
+
+int swf_ShapeSetCircle(TAG * t,SHAPE * s,S32 x,S32 y,S32 rx,S32 ry)
+{ double C1 = 0.2930;    
+  double C2 = 0.4140;   
+  double begin = 0.7070; 
+
+  if (!t) return -1;
+  
+  swf_ShapeSetMove(t,s,x+begin*rx,y+begin*ry);
+  swf_ShapeSetCurve(t,s, -C1*rx,  C1*ry, -C2*rx,      0);
+  swf_ShapeSetCurve(t,s, -C2*rx,      0, -C1*rx, -C1*ry);
+  swf_ShapeSetCurve(t,s, -C1*rx, -C1*ry,      0, -C2*ry);
+  swf_ShapeSetCurve(t,s,      0, -C2*ry,  C1*rx, -C1*ry);
+  swf_ShapeSetCurve(t,s,  C1*rx, -C1*ry,  C2*rx,      0);
+  swf_ShapeSetCurve(t,s,  C2*rx,      0,  C1*rx,  C1*ry);
+  swf_ShapeSetCurve(t,s,  C1*rx,  C1*ry,      0,  C2*ry);
+  swf_ShapeSetCurve(t,s,      0,  C2*ry, -C1*rx,  C1*ry);
+  
+  return 0;
+}
+
+/* todo: merge this with swf_GetSimpleShape */
+SHAPELINE* swf_ParseShapeData(U8*data, int bits, int fillbits, int linebits)
+{
+    SHAPELINE _lines;
+    SHAPELINE*lines = &_lines;
+
+    TAG _tag;
+    TAG* tag = &_tag;
+    int fill0 = 0;
+    int fill1 = 0;
+    int line = 0;
+    int x=0,y=0;
+    
+    memset(tag, 0, sizeof(TAG));
+    tag->data = data;
+    tag->len = tag->memsize = (bits+7)/8;
+    tag->pos = 0;
+
+    lines->next = 0;
+    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); 
+               x = swf_GetSBits(tag, n); //x
+               y = swf_GetSBits(tag, n); //y
+           }
+           if(flags&2)
+               fill0 = swf_GetBits(tag, fillbits); 
+           if(flags&4)
+               fill1 = swf_GetBits(tag, fillbits); 
+           if(flags&8)
+               line = swf_GetBits(tag, linebits); 
+           if(flags&16) {
+               fprintf(stderr, "Additional file styles style change not yet supported\n");
+               exit(1);
+               //enumerateUsedIDs_styles(tag, callback, callback_data, num);
+               fillbits = swf_GetBits(tag, 4);
+               linebits = swf_GetBits(tag, 4);
+           }
+           if(flags&1) { //move
+               lines->next = (SHAPELINE*)rfx_alloc(sizeof(SHAPELINE));
+               lines = lines->next;
+               lines->type = moveTo;
+               lines->x = x; 
+               lines->y = y; 
+               lines->sx = lines->sy = 0;
+               lines->fillstyle0 = fill0;
+               lines->fillstyle1 = fill1;
+               lines->linestyle = line;
+               lines->next = 0;
+           }
+       } else {
+           flags = swf_GetBits(tag, 1);
+           if(flags) { //straight edge
+               int n = swf_GetBits(tag, 4) + 2;
+               if(swf_GetBits(tag, 1)) { //line flag
+                   x += swf_GetSBits(tag, n); //delta x
+                   y += swf_GetSBits(tag, n); //delta y
+               } else {
+                   int v=swf_GetBits(tag, 1);
+                   int d;
+                   d = swf_GetSBits(tag, n); //vert/horz
+                   if(v) y += d;
+                   else  x += d;
+               }
+               lines->next = (SHAPELINE*)rfx_alloc(sizeof(SHAPELINE));
+               lines = lines->next;
+               lines->type = lineTo;
+               lines->x = x; 
+               lines->y = y; 
+               lines->sx = lines->sy = 0;
+               lines->fillstyle0 = fill0;
+               lines->fillstyle1 = fill1;
+               lines->linestyle = line;
+               lines->next = 0;
+           } else { //curved edge
+               int n = swf_GetBits(tag, 4) + 2;
+               int x1,y1;
+               x += swf_GetSBits(tag, n);
+               y += swf_GetSBits(tag, n);
+               x1 = x;
+               y1 = y;
+               x += swf_GetSBits(tag, n);
+               y += swf_GetSBits(tag, n);
+
+               lines->next = (SHAPELINE*)rfx_alloc(sizeof(SHAPELINE));
+               lines = lines->next;
+               lines->type = splineTo;
+               lines->sx = x1; 
+               lines->sy = y1; 
+               lines->x = x; 
+               lines->y = y; 
+               lines->fillstyle0 = fill0;
+               lines->fillstyle1 = fill1;
+               lines->linestyle = line;
+               lines->next = 0;
+           }
+       }
+    }
+    return _lines.next;
+}
+
+SRECT swf_GetShapeBoundingBox(SHAPE2*shape2)
+{
+    SRECT r;
+    SHAPELINE*l = shape2->lines;
+    int lastx=0,lasty=0;
+    int valid = 0;
+    r.xmin = r.ymin = SCOORD_MAX;
+    r.xmax = r.ymax = SCOORD_MIN;
+
+    while(l) {
+       int t1;
+       if(l->linestyle>0) {
+           t1 = shape2->linestyles[l->linestyle - 1].width*3/2;
+       } else {
+           t1 = 0;
+       }
+
+       if(l->type == lineTo || l->type == splineTo)
+       {
+           valid = 1;
+           if(lastx - t1 < r.xmin) r.xmin = lastx - t1;
+           if(lasty - t1 < r.ymin) r.ymin = lasty - t1;
+           if(lastx + t1 > r.xmax) r.xmax = lastx + t1;
+           if(lasty + t1 > r.ymax) r.ymax = lasty + t1;
+           if(l->x - t1 < r.xmin) r.xmin = l->x - t1;
+           if(l->y - t1 < r.ymin) r.ymin = l->y - t1;
+           if(l->x + t1 > r.xmax) r.xmax = l->x + t1;
+           if(l->y + t1 > r.ymax) r.ymax = l->y + t1;
+           if(l->type == splineTo) {
+               if(l->sx - t1 < r.xmin) r.xmin = l->sx - t1;
+               if(l->sy - t1 < r.ymin) r.ymin = l->sy - t1;
+               if(l->sx + t1 > r.xmax) r.xmax = l->sx + t1;
+               if(l->sy + t1 > r.ymax) r.ymax = l->sy + t1;
+           }
+       }
+       lastx = l->x;
+       lasty = l->y;
+       l = l->next;
+    }
+    if(!valid) memset(&r, 0, sizeof(SRECT));
+    return r;
+}
+
+void swf_Shape2Free(SHAPE2 * s)
+{
+    SHAPELINE*line = s->lines;
+    while(line) {
+       SHAPELINE*next = line->next;
+       rfx_free(line);
+       line = next;
+    }
+    if(s->linestyles)
+       rfx_free(s->linestyles);
+    if(s->fillstyles)
+       rfx_free(s->fillstyles);
+    if(s->bbox)
+       rfx_free(s->bbox);
+}
+
+SHAPE2* swf_Shape2Clone(SHAPE2 * s)
+{
+    SHAPELINE*line = s->lines;
+    SHAPELINE*prev = 0;
+    SHAPE2*s2 = rfx_alloc(sizeof(SHAPE2));
+    memcpy(s2,s,sizeof(SHAPE2));
+    s2->linestyles = rfx_alloc(sizeof(LINESTYLE)*s->numlinestyles);
+    memcpy(s2->linestyles, s->linestyles, sizeof(LINESTYLE)*s->numlinestyles);
+    s2->fillstyles = rfx_alloc(sizeof(FILLSTYLE)*s->numfillstyles);
+    memcpy(s2->fillstyles, s->fillstyles, sizeof(FILLSTYLE)*s->numfillstyles);
+
+    while(line) {
+       SHAPELINE*line2 = rfx_alloc(sizeof(SHAPELINE));
+        memcpy(line2, line, sizeof(SHAPELINE));
+        line2->next = 0;
+        if(prev)
+            prev->next = line2;
+        else
+            s2->lines = line2;
+        prev = line2;
+       line = line->next;
+    }
+    if(s->bbox) {
+        s2->bbox = rfx_alloc(sizeof(SRECT));
+        memcpy(s2->bbox, s->bbox, sizeof(SRECT));
+    }
+    return s2;
+}
+
+SHAPE2* swf_ShapeToShape2(SHAPE*shape) {
+
+    SHAPE2*shape2 = (SHAPE2*)rfx_calloc(sizeof(SHAPE2));
+    
+    shape2->numlinestyles = shape->linestyle.n;
+    if(shape2->numlinestyles) {
+        shape2->linestyles = (LINESTYLE*)rfx_alloc(sizeof(LINESTYLE)*shape->linestyle.n);
+        memcpy(shape2->linestyles, shape->linestyle.data, sizeof(LINESTYLE)*shape->linestyle.n);
+    }
+    
+    shape2->numfillstyles = shape->fillstyle.n;
+    if(shape2->numfillstyles) {
+        shape2->fillstyles = (FILLSTYLE*)rfx_alloc(sizeof(FILLSTYLE)*shape->fillstyle.n);
+        memcpy(shape2->fillstyles, shape->fillstyle.data, sizeof(FILLSTYLE)*shape->fillstyle.n);
+    }
+
+    shape2->lines = swf_ParseShapeData(shape->data, shape->bitlen, shape->bits.fill, shape->bits.line);
+    shape2->bbox = 0;
+    return shape2;
+};
+
+void swf_ShapeSetBitmapRect(TAG*tag, U16 gfxid, int width, int height)
+{
+    SHAPE*shape;
+    MATRIX m;
+    RGBA rgb;
+    SRECT r;
+    int lines = 0;
+    int ls=0,fs;
+    swf_ShapeNew(&shape);
+    rgb.b = rgb.g = rgb.r = 0xff;
+    if(lines)
+       ls = swf_ShapeAddLineStyle(shape,20,&rgb);  
+    swf_GetMatrix(NULL,&m);
+    m.sx = 20*65536;
+    m.sy = 20*65536;
+
+    fs = swf_ShapeAddBitmapFillStyle(shape,&m,gfxid,0);
+    r.xmin = 0;
+    r.ymin = 0;
+    r.xmax = width*20;
+    r.ymax = height*20;
+    swf_SetRect(tag,&r);
+
+    swf_SetShapeStyles(tag,shape);
+    swf_ShapeCountBits(shape,NULL,NULL);
+    swf_SetShapeBits(tag,shape);
+
+    swf_ShapeSetAll(tag,shape,0,0,lines?ls:0,fs,0);
+
+    swf_ShapeSetLine(tag,shape,width*20,0);
+    swf_ShapeSetLine(tag,shape,0,height*20);
+    swf_ShapeSetLine(tag,shape,-width*20,0);
+    swf_ShapeSetLine(tag,shape,0,-height*20);
+    swf_ShapeSetEnd(tag);
+    swf_ShapeFree(shape);
+}
+
+void swf_Shape2ToShape(SHAPE2*shape2, SHAPE*shape)
+{
+    TAG*tag = swf_InsertTag(0,0);
+    SHAPELINE*l,*next;
+    int newx=0,newy=0,lastx=0,lasty=0,oldls=0,oldfs0=0,oldfs1=0;
+
+    memset(shape, 0, sizeof(SHAPE));
+
+    shape->linestyle.n = shape2->numlinestyles;
+    shape->linestyle.data = (LINESTYLE*)rfx_alloc(sizeof(LINESTYLE)*shape->linestyle.n);
+    memcpy(shape->linestyle.data, shape2->linestyles, sizeof(LINESTYLE)*shape->linestyle.n);
+    
+    shape->fillstyle.n =  shape2->numfillstyles;
+    shape->fillstyle.data = (FILLSTYLE*)rfx_alloc(sizeof(FILLSTYLE)*shape->fillstyle.n);
+    memcpy(shape->fillstyle.data, shape2->fillstyles, sizeof(FILLSTYLE)*shape->fillstyle.n);
+
+    swf_ShapeCountBits(shape,NULL,NULL);
+
+    l = shape2->lines;
+
+    while(l) {
+       int ls=0,fs0=0,fs1=0;
+
+       if(l->type != moveTo) {
+           if(oldls != l->linestyle) {oldls = ls = l->linestyle;if(!ls) ls=0x8000;}
+           if(oldfs0 != l->fillstyle0) {oldfs0 = fs0 = l->fillstyle0;if(!fs0) fs0=0x8000;}
+           if(oldfs1 != l->fillstyle1) {oldfs1 = fs1 = l->fillstyle1;if(!fs1) fs1=0x8000;}
+
+           if(ls || fs0 || fs1 || newx!=0x7fffffff || newy!=0x7fffffff) {
+               swf_ShapeSetAll(tag,shape,newx,newy,ls,fs0,fs1);
+               newx = 0x7fffffff;
+               newy = 0x7fffffff;
+           }
+       }
+
+       if(l->type == lineTo) {
+           swf_ShapeSetLine(tag,shape,l->x-lastx,l->y-lasty);
+       } else if(l->type == splineTo) {
+           swf_ShapeSetCurve(tag,shape, l->sx-lastx,l->sy-lasty, l->x-l->sx,l->y-l->sy);
+       }
+       if(l->type == moveTo) {
+           newx = l->x;
+           newy = l->y;
+       }
+
+       lastx = l->x;
+       lasty = l->y;
+       l = l->next;
+    }
+    swf_ShapeSetEnd(tag);
+    shape->data = tag->data;
+    shape->bitlen = tag->len*8;
+}
+
+void swf_SetShape2(TAG*tag, SHAPE2*shape2)
+{
+    SHAPE shape;
+    swf_Shape2ToShape(shape2, &shape);
+
+    swf_SetRect(tag,shape2->bbox);
+    swf_SetShapeStyles(tag, &shape);
+    //swf_ShapeCountBits(&shape,NULL,NULL); // done in swf_Shape2ToShape()
+    swf_SetShapeBits(tag,&shape);
+
+    swf_SetBlock(tag, shape.data, (shape.bitlen+7)/8);
+}
+
+static void parseFillStyleArray(TAG*tag, SHAPE2*shape)
+{
+    U16 count;
+    int t;
+    int num=0;
+    if(tag->id == ST_DEFINESHAPE)
+       num = 1;
+    else if(tag->id == ST_DEFINESHAPE2)
+       num = 2;
+    else if(tag->id == ST_DEFINESHAPE3)
+       num = 3;
+
+    count = swf_GetU8(tag);
+    if(count == 0xff && num>1) // defineshape2,3 only
+       count = swf_GetU16(tag);
+
+    shape->numfillstyles = count;
+
+    if(shape->numfillstyles) {
+        shape->fillstyles = rfx_alloc(sizeof(FILLSTYLE)*count);
+
+        for(t=0;t<count;t++)
+        {
+            int type;
+            U8*pos;
+            FILLSTYLE*dest = &shape->fillstyles[t];
+            type = swf_GetU8(tag); //type
+            shape->fillstyles[t].type = type;
+            if(type == 0) {
+                /* plain color */
+                if(num == 3)
+                    swf_GetRGBA(tag, &dest->color);
+                else 
+                    swf_GetRGB(tag, &dest->color);
+            }
+            else if(type == 0x10 || type == 0x12)
+            {
+                /* linear/radial gradient fill */
+                swf_ResetReadBits(tag);
+                swf_GetMatrix(tag, &dest->m);
+                swf_ResetReadBits(tag);
+                swf_GetGradient(tag, &dest->gradient, num>=3?1:0);
+            }
+            else if(type == 0x40 || type == 0x41)
+            {
+                /* bitmap fill */
+                swf_ResetReadBits(tag);
+                dest->id_bitmap = swf_GetU16(tag); //id
+                swf_ResetReadBits(tag); //?
+                swf_GetMatrix(tag, &dest->m);
+            }
+            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);
+
+    //if(verbose) printf("lnum: %d\n", count);
+
+    shape->numlinestyles = count;
+    if(count) {
+        shape->linestyles = rfx_alloc(sizeof(LINESTYLE)*count);
+        /* TODO: should we start with 1 and insert a correct definition of the
+           "built in" linestyle 0? */
+        for(t=0;t<count;t++) 
+        {
+            shape->linestyles[t].width = swf_GetU16(tag);
+            if(num == 3)
+                swf_GetRGBA(tag, &shape->linestyles[t].color);
+            else
+                swf_GetRGB(tag, &shape->linestyles[t].color);
+        }
+    }
+    return;
+}
+
+void swf_ParseDefineShape(TAG*tag, SHAPE2*shape)
+{
+    int num = 0, id;
+    U16 fill,line;
+    SRECT r;
+    SRECT r2;
+    SHAPELINE*l;
+    if(tag->id == ST_DEFINESHAPE)
+       num = 1;
+    else if(tag->id == ST_DEFINESHAPE2)
+       num = 2;
+    else if(tag->id == ST_DEFINESHAPE3)
+       num = 3;
+    else {
+       fprintf(stderr, "parseDefineShape must be called with a shape tag");
+    }
+    swf_SetTagPos(tag, 0);
+
+    id = swf_GetU16(tag); //id
+    memset(shape, 0, sizeof(SHAPE2));
+    shape->bbox = rfx_alloc(sizeof(SRECT));
+    swf_GetRect(tag, &r);
+
+    memcpy(shape->bbox, &r, sizeof(SRECT));
+    parseFillStyleArray(tag, shape);
+
+    swf_ResetReadBits(tag); 
+    fill = (U16)swf_GetBits(tag,4);
+    line = (U16)swf_GetBits(tag,4);
+
+    shape->lines = swf_ParseShapeData(&tag->data[tag->pos], (tag->len - tag->pos)*8, fill, line);
+
+    l = shape->lines;
+}
+
+void swf_RecodeShapeData(U8*data, int bitlen, int in_bits_fill, int in_bits_line, 
+                         U8**destdata, U32*destbitlen, int out_bits_fill, int out_bits_line)
+{
+    SHAPE2 s2;
+    SHAPE s;
+    SHAPELINE*line;
+    memset(&s2, 0, sizeof(s2));
+    s2.lines = swf_ParseShapeData(data, bitlen, in_bits_fill, in_bits_line);
+    s2.numfillstyles = out_bits_fill?1<<(out_bits_fill-1):0;
+    s2.numlinestyles = out_bits_line?1<<(out_bits_line-1):0;
+    s2.fillstyles = rfx_calloc(sizeof(FILLSTYLE)*s2.numfillstyles);
+    s2.linestyles = rfx_calloc(sizeof(LINESTYLE)*s2.numlinestyles);
+
+    line = s2.lines;
+    while(line) {
+        if(line->fillstyle0 > s2.numfillstyles) line->fillstyle0 = 0;
+        if(line->fillstyle1 > s2.numfillstyles) line->fillstyle1 = 0;
+        if(line->linestyle > s2.numlinestyles) line->linestyle = 0;
+        line = line->next;
+    }
+
+    swf_Shape2ToShape(&s2,&s);
+
+    free(s2.fillstyles);
+    free(s2.linestyles);
+    free(s.fillstyle.data);
+    free(s.linestyle.data);
+    *destdata = s.data;
+    *destbitlen = s.bitlen;
+}
+