X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fmodules%2Fswfshape.c;h=a8ff95650a03c84e377bc932ad7e44f299b45f8e;hb=cfb06dab4b1674078f1306d1c537ad03d00def26;hp=dbd6c56e1a4499395b27385768ee5c103f34836c;hpb=0a28555a52d08dc5b97b7aed5746dfb73326ef28;p=swftools.git

diff --git a/lib/modules/swfshape.c b/lib/modules/swfshape.c
index dbd6c56..a8ff956 100644
--- a/lib/modules/swfshape.c
+++ b/lib/modules/swfshape.c
@@ -1,530 +1,530 @@
-/* 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 file is distributed under the GPL, see file COPYING for details 
-
-*/
-
-#define SF_MOVETO       0x01
-#define SF_FILL0        0x02
-#define SF_FILL1        0x04
-#define SF_LINE         0x08
-#define SF_NEWSTYLE     0x10
-
-#define FILL_SOLID      0x00
-#define FILL_LINEAR     0x10  // Gradient
-#define FILL_RADIAL     0x12
-#define FILL_TILED      0x40  // Bitmap
-#define FILL_CLIPPED    0x41
-
-void ShapeFree(LPSHAPE s)
-{ if (s)
-  { if (s->linestyle.data) free(s->linestyle.data);
-    s->linestyle.data = NULL;
-    s->linestyle.n    = 0;
-    if (s->fillstyle.data) free(s->fillstyle.data);
-    s->fillstyle.data = NULL;
-    s->fillstyle.n    = 0;
-    if (s->data) free(s->data);
-    s->data = NULL;
-  }
-  free(s);
-}
-
-int NewShape(LPSHAPE * s)
-{ LPSHAPE sh;
-  if (!s) return -1;
-  sh = (LPSHAPE)malloc(sizeof(SHAPE)); s[0] = sh;
-  if (sh) memset(sh,0x00,sizeof(SHAPE));
-  return sh?0:-1;
-}
-
-int GetSimpleShape(LPTAG t,LPSHAPE * s) // without Linestyle/Fillstyle Record
-{ LPSHAPE sh;
-  int bitl, len;
-  int end;
-  U32 pos;
-  
-  if (FAILED(NewShape(s))) return -1;
-  sh = s[0];
-
-  ResetBitmask(t); 
-  sh->bits.fill = (U16)GetBits(t,4);
-  sh->bits.line = (U16)GetBits(t,4);
-  bitl = 0; end = 0; pos = GetTagPos(t);
-
-  while (!end)
-  { int edge = GetBits(t,1); bitl+=1;
-    if (edge)
-    { bitl+=1;
-      if (GetBits(t,1))                 // Line
-      { U16 nbits = GetBits(t,4)+2;
-        bitl+=5;
-
-        if (GetBits(t,1))               // x/y Line
-        { GetBits(t,nbits);
-          GetBits(t,nbits);
-          bitl+=nbits*2;
-        }
-        else                            // hline/vline
-        { GetBits(t,nbits+1);
-          bitl+=nbits+1;
-        }
-      }
-      else                              // Curve
-      { U16 nbits = GetBits(t,4)+2;
-        bitl+=4;
-
-        GetBits(t,nbits);
-        GetBits(t,nbits);
-        GetBits(t,nbits);
-        GetBits(t,nbits);
-
-        bitl+=4*nbits;
-      }
-    }
-    else
-    { U16 flags = GetBits(t,5); bitl+=5;
-      if (flags)
-      {
-        if (flags&SF_MOVETO)
-        { U16 nbits = GetBits(t,5); bitl+=5;
-          GetBits(t,nbits);
-          GetBits(t,nbits);
-          bitl+=2*nbits;
-        }
-        
-        if (flags&SF_FILL0)
-        { GetBits(t,sh->bits.fill);
-          bitl+=sh->bits.fill;
-        }
-        
-        if (flags&SF_FILL1)
-        { GetBits(t,sh->bits.fill);
-          bitl+=sh->bits.fill;
-        }
-
-        if (flags&SF_LINE)
-        { GetBits(t,sh->bits.line);
-          bitl+=sh->bits.line;
-        }
-
-        if (flags&SF_NEWSTYLE)
-        { fprintf(stderr,"Can't process extended styles in shape.\n");
-        }
-      }
-      else end = 1;
-    }
-  }
-  SetTagPos(t,pos);
-  len = (bitl+7)/8;
-  
-  if (sh->data) free(sh->data);
-  sh->data = (U8*)malloc(len);
-  
-  if (sh->data)
-  { sh->bitlen = bitl;
-    GetBlock(t,sh->data,len);
-  }
-  else return -1;
-  
-  return len;
-}
-
-int SetSimpleShape(LPTAG t,LPSHAPE s) // without Linestyle/Fillstyle Record
-{ int l;
-
-  if (!s) return -1;
-  l = (s->bitlen+7)/8;
-
-  if (t)
-  { ResetBitcount(t);
-
-    SetBits(t,s->bits.fill,4);
-    SetBits(t,s->bits.line,4);
-    SetBlock(t,s->data,l);
-
-    ResetBitcount(t);
-  }
-  return l+1;
-}
-
-int SetFillStyle(LPTAG t,LPFILLSTYLE f)
-{ if ((!t)||(!f)) return -1;
-  SetU8(t,f->type);
-  
-  // no gradients yet!
-  
-  switch (f->type)
-  { case FILL_SOLID:
-      if (GetTagID(t)!=ST_DEFINESHAPE3) SetRGB(t,&f->color);
-      else SetRGBA(t,&f->color);
-      break;
-
-    case FILL_TILED:
-    case FILL_CLIPPED:
-      SetU16(t,f->id_bitmap);
-      SetMatrix(t,&f->m);
-      break;
-  }
-  
-  return 0;
-}
-
-int SetLineStyle(LPTAG t,LPLINESTYLE l)
-{ if ((!l)||(!t)) return -1;
-  SetU16(t,l->width);
-
-  if (GetTagID(t)!=ST_DEFINESHAPE3) SetRGB(t,&l->color);
-  else SetRGBA(t,&l->color);
-  
-  return 0;
-}
-
-int SetShapeStyleCount(LPTAG t,U16 n)
-{ if (n>254)
-  { SetU8(t,0xff);
-    SetU16(t,n);
-    return 3;
-  }
-  else
-  { SetU8(t,n);
-    return 1;
-  }
-}
-
-int SetShapeStyles(LPTAG t,LPSHAPE s)
-{ int i,l;
-  if (!s) return -1;
-
-  l = 0;
-  l += SetShapeStyleCount(t,s->fillstyle.n);
-
-  for (i=0;i<s->fillstyle.n;i++)
-    l+=SetFillStyle(t,&s->fillstyle.data[i]);
-
-  l += SetShapeStyleCount(t,s->linestyle.n);
-
-  for (i=0;i<s->linestyle.n;i++)
-    l+=SetLineStyle(t,&s->linestyle.data[i]);
-
-  return l;
-}
-
-int ShapeCountBits(LPSHAPE s,U8 * fbits,U8 * lbits)
-{ if (!s) return -1;
-    
-  s->bits.fill = CountBits(s->fillstyle.n,0);
-  s->bits.line = CountBits(s->linestyle.n,0);
-
-  if (fbits) fbits[0] = s->bits.fill;
-  if (lbits) lbits[0] = s->bits.line;
-  
-  return 0;    
-}
-
-int SetShapeBits(LPTAG t,LPSHAPE s)
-{ if ((!t)||(!s)) return -1;
-  ResetBitcount(t);
-  SetBits(t,s->bits.fill,4);
-  SetBits(t,s->bits.line,4);
-  return 0;
-}
-
-int SetShapeHeader(LPTAG t,LPSHAPE s)
-{ int res;
-  res = SetShapeStyles(t,s);
-  if (res>=0) res = ShapeCountBits(s,NULL,NULL);
-  if (res>=0) res = SetShapeBits(t,s);
-  return res;
-}
-
-int ShapeExport(int handle,LPSHAPE s)  // without Linestyle/Fillstyle Record
-{ int l;
-  if (!s) return 0;
-
-  l = sizeof(SHAPE);
-
-  if (handle>=0)
-    if (write(handle,s,sizeof(SHAPE))!=sizeof(SHAPE)) return -1;
-
-  // Fillstyle, Linestyle ...
-
-  if (s->data)
-  { int ll = (s->bitlen+7)/8;
-    l+=ll;
-    if (handle>=0)
-      if (write(handle,s->data,ll)!=ll) return -1;
-  }
-
-  return l;
-}
-
-int ShapeImport(int handle,LPSHAPE * shape)
-{ LPSHAPE s;
-
-  if (handle<0) return -1;
-
-  s = (LPSHAPE)malloc(sizeof(SHAPE)); shape[0] = s;
-  if (!s) return -1;
-
-  if (read(handle,s,sizeof(SHAPE))!=sizeof(SHAPE))
-  { shape[0] = NULL;
-    free(s);
-    return -1;
-  }
-
-  if (s->data)
-  { int ll = (s->bitlen+7)/8;
-    s->data = (U8*)malloc(ll);
-    if (!s->data)
-    { shape[0] = NULL;
-      free(s);
-      return -1;
-    }
-    if (read(handle,s->data,ll)!=ll)
-    { free(s->data);
-      free(s);
-      shape[0] = NULL;
-      return -1;
-    }
-  }
-
-  return 0;
-}
-
-int ShapeAddFillStyle(LPSHAPE s,U8 type,LPMATRIX m,LPRGBA color,U16 id_bitmap)
-{ RGBA def_c;
-  MATRIX def_m;    
-
-  // 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;
-    GetMatrix(NULL,m);
-  }
-
-  // handle memory
-  
-  if (s->fillstyle.data)
-  { LPFILLSTYLE new = (LPFILLSTYLE)realloc(s->fillstyle.data,(s->fillstyle.n+1)*sizeof(FILLSTYLE));
-    if (!new) return -1;
-    s->fillstyle.data = new;
-  }
-  else
-  { s->fillstyle.data = (LPFILLSTYLE)malloc(sizeof(FILLSTYLE));
-    s->fillstyle.n = 0;
-    if (!s->fillstyle.data) return -1;
-  }
-
-  // set fillstyle  (no gradients yet!)
-  
-  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));
-          
-  return (++s->fillstyle.n);
-}
-
-int ShapeAddSolidFillStyle(LPSHAPE s,LPRGBA color)
-{ return ShapeAddFillStyle(s,FILL_SOLID,NULL,color,0);
-}
-
-int ShapeAddBitmapFillStyle(LPSHAPE s,LPMATRIX m,U16 id_bitmap,int clip)
-{ return ShapeAddFillStyle(s,clip?FILL_CLIPPED:FILL_TILED,m,NULL,id_bitmap);
-}
-
-int ShapeAddLineStyle(LPSHAPE s,U16 width,LPRGBA 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)
-  { LPLINESTYLE new = (LPLINESTYLE)realloc(s->linestyle.data,(s->linestyle.n+1)*sizeof(LINESTYLE));
-    if (!new) return -1;
-    s->linestyle.data = new;
-  }
-  else
-  { s->linestyle.data = (LPLINESTYLE)malloc(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 ShapeSetMove(LPTAG t,LPSHAPE s,S32 x,S32 y)
-{ U8 b;
-  if (!t) return -1;
-  SetBits(t,0,1);
-  SetBits(t,SF_MOVETO,5);
-  
-  b = CountBits(x,0);
-  b = CountBits(y,b);
-  
-  SetBits(t,b,5);
-  SetBits(t,x,b);
-  SetBits(t,y,b);
-
-  if (s)
-  { s->px = x;
-    s->py = y;
-  }
-  return 0;
-}
-
-int ShapeSetStyle(LPTAG t,LPSHAPE s,U16 line,U16 fill0,U16 fill1)
-{ if ((!t)||(!s)) return -1;
-    
-  SetBits(t,0,1);
-  SetBits(t,(line?SF_LINE:0)|(fill0?SF_FILL0:0)|(fill1?SF_FILL1:0),5);
-
-  if (fill0) SetBits(t,fill0,s->bits.fill);
-  if (fill1) SetBits(t,fill1,s->bits.fill);
-  if (line)  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 FILL_RESET 0x8000
-#define LINE_RESET 0x8000
-int ShapeSetAll(LPTAG t,LPSHAPE s,S32 x,S32 y,U16 line,U16 fill0,U16 fill1)
-{ U8 b;
-  if ((!t)||(!s)) return -1;
-
-  SetBits(t,0,1);
-  SetBits(t,SF_MOVETO|(line?SF_LINE:0)|(fill0?SF_FILL0:0)|(fill1?SF_FILL1:0),5);
-
-  b = CountBits(x,0);
-  b = CountBits(y,b);
-  SetBits(t,b,5);
-  SetBits(t,x,b);
-  SetBits(t,y,b);
-  s->px = x;
-  s->py = y;
-
-  if (fill0) SetBits(t,fill0,s->bits.fill);
-  if (fill1) SetBits(t,fill1,s->bits.fill);
-  if (line)  SetBits(t,line ,s->bits.line);
-  
-  return 0;
-}
-
-int ShapeSetEnd(LPTAG t)
-{ if (!t) return -1;
-  SetBits(t,0,6);
-  ResetBitcount(t);
-  return 0;
-}
-
-int ShapeSetLine(LPTAG t,LPSHAPE s,S32 x,S32 y)
-{ U8 b;
-  if (!t) return -1;
-  SetBits(t,3,2); // Straight Edge
-
-  if ((!s)||((x!=0)&&(y!=0)))
-  { b = CountBits(x,2);
-    b = CountBits(y,b);
-    if(b<2) 
-	b=2;
-    SetBits(t, b-2, 4);
-    SetBits(t,1,1);
-    SetBits(t,x,b);
-    SetBits(t,y,b);
-    if (s)
-    { s->px += x;
-      s->py += y;
-    }
-    return 0;
-  }
-
-  if (x==0)
-  { b = CountBits(y,2);
-    if(b<2) 
-	b=2;
-    SetBits(t, b-2, 4);
-    SetBits(t,1,2);
-    SetBits(t,y,b);
-    s->py += y;
-  }
-  else
-  { b = CountBits(x,2);
-    if(b<2) 
-	b=2;
-    SetBits(t, b-2, 4);
-    SetBits(t,0,2);
-    SetBits(t,x,b);
-    s->px += x;
-  }
-  return 0;
-}
-
-int ShapeSetCurve(LPTAG t,LPSHAPE s,S32 x,S32 y,S32 ax,S32 ay)
-{ U8 b;
-  if (!t) return -1;
-
-  SetBits(t,2,2);
-
-  b = CountBits(ax,2);
-  b = CountBits(ay,b);
-  b = CountBits(x,b);
-  b = CountBits(y,b);
-
-  SetBits(t,b-2,4);
-  SetBits(t,x,b);
-  SetBits(t,y,b);
-  SetBits(t,ax,b);
-  SetBits(t,ay,b);
-
-  if (s)
-  { s->px += x+ax;
-    s->py += y+ay;
-  }
-  return 0;
-}
-
-int ShapeSetCircle(LPTAG t,LPSHAPE 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;
-  
-  ShapeSetMove(t,s,x+begin*rx,y+begin*ry);
-  ShapeSetCurve(t,s, -C1*rx,  C1*ry, -C2*rx,      0);
-  ShapeSetCurve(t,s, -C2*rx,      0, -C1*rx, -C1*ry);
-  ShapeSetCurve(t,s, -C1*rx, -C1*ry,      0, -C2*ry);
-  ShapeSetCurve(t,s,      0, -C2*ry,  C1*rx, -C1*ry);
-  ShapeSetCurve(t,s,  C1*rx, -C1*ry,  C2*rx,      0);
-  ShapeSetCurve(t,s,  C2*rx,      0,  C1*rx,  C1*ry);
-  ShapeSetCurve(t,s,  C1*rx,  C1*ry,      0,  C2*ry);
-  ShapeSetCurve(t,s,      0,  C2*ry, -C1*rx,  C1*ry);
-  
-  return 0;
-}
-
+/* 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 file is distributed under the GPL, see file COPYING for details 
+
+*/
+
+#define SF_MOVETO       0x01
+#define SF_FILL0        0x02
+#define SF_FILL1        0x04
+#define SF_LINE         0x08
+#define SF_NEWSTYLE     0x10
+
+#define FILL_SOLID      0x00
+#define FILL_LINEAR     0x10  // Gradient
+#define FILL_RADIAL     0x12
+#define FILL_TILED      0x40  // Bitmap
+#define FILL_CLIPPED    0x41
+
+void ShapeFree(SHAPE * s)
+{ if (s)
+  { if (s->linestyle.data) free(s->linestyle.data);
+    s->linestyle.data = NULL;
+    s->linestyle.n    = 0;
+    if (s->fillstyle.data) free(s->fillstyle.data);
+    s->fillstyle.data = NULL;
+    s->fillstyle.n    = 0;
+    if (s->data) free(s->data);
+    s->data = NULL;
+  }
+  free(s);
+}
+
+int NewShape(SHAPE * * s)
+{ SHAPE * sh;
+  if (!s) return -1;
+  sh = (SHAPE *)malloc(sizeof(SHAPE)); s[0] = sh;
+  if (sh) memset(sh,0x00,sizeof(SHAPE));
+  return sh?0:-1;
+}
+
+int GetSimpleShape(TAG * t,SHAPE * * s) // without Linestyle/Fillstyle Record
+{ SHAPE * sh;
+  int bitl, len;
+  int end;
+  U32 pos;
+  
+  if (FAILED(NewShape(s))) return -1;
+  sh = s[0];
+
+  ResetBitmask(t); 
+  sh->bits.fill = (U16)GetBits(t,4);
+  sh->bits.line = (U16)GetBits(t,4);
+  bitl = 0; end = 0; pos = GetTagPos(t);
+
+  while (!end)
+  { int edge = GetBits(t,1); bitl+=1;
+    if (edge)
+    { bitl+=1;
+      if (GetBits(t,1))                 // Line
+      { U16 nbits = GetBits(t,4)+2;
+        bitl+=5;
+
+        if (GetBits(t,1))               // x/y Line
+        { GetBits(t,nbits);
+          GetBits(t,nbits);
+          bitl+=nbits*2;
+        }
+        else                            // hline/vline
+        { GetBits(t,nbits+1);
+          bitl+=nbits+1;
+        }
+      }
+      else                              // Curve
+      { U16 nbits = GetBits(t,4)+2;
+        bitl+=4;
+
+        GetBits(t,nbits);
+        GetBits(t,nbits);
+        GetBits(t,nbits);
+        GetBits(t,nbits);
+
+        bitl+=4*nbits;
+      }
+    }
+    else
+    { U16 flags = GetBits(t,5); bitl+=5;
+      if (flags)
+      {
+        if (flags&SF_MOVETO)
+        { U16 nbits = GetBits(t,5); bitl+=5;
+          GetBits(t,nbits);
+          GetBits(t,nbits);
+          bitl+=2*nbits;
+        }
+        
+        if (flags&SF_FILL0)
+        { GetBits(t,sh->bits.fill);
+          bitl+=sh->bits.fill;
+        }
+        
+        if (flags&SF_FILL1)
+        { GetBits(t,sh->bits.fill);
+          bitl+=sh->bits.fill;
+        }
+
+        if (flags&SF_LINE)
+        { GetBits(t,sh->bits.line);
+          bitl+=sh->bits.line;
+        }
+
+        if (flags&SF_NEWSTYLE)
+        { fprintf(stderr,"Can't process extended styles in shape.\n");
+        }
+      }
+      else end = 1;
+    }
+  }
+  SetTagPos(t,pos);
+  len = (bitl+7)/8;
+  
+  if (sh->data) free(sh->data);
+  sh->data = (U8*)malloc(len);
+  
+  if (sh->data)
+  { sh->bitlen = bitl;
+    GetBlock(t,sh->data,len);
+  }
+  else return -1;
+  
+  return len;
+}
+
+int SetSimpleShape(TAG * t,SHAPE * s) // without Linestyle/Fillstyle Record
+{ int l;
+
+  if (!s) return -1;
+  l = (s->bitlen+7)/8;
+
+  if (t)
+  { ResetBitcount(t);
+
+    SetBits(t,s->bits.fill,4);
+    SetBits(t,s->bits.line,4);
+    SetBlock(t,s->data,l);
+
+    ResetBitcount(t);
+  }
+  return l+1;
+}
+
+int SetFillStyle(TAG * t,FILLSTYLE * f)
+{ if ((!t)||(!f)) return -1;
+  SetU8(t,f->type);
+  
+  // no gradients yet!
+  
+  switch (f->type)
+  { case FILL_SOLID:
+      if (GetTagID(t)!=ST_DEFINESHAPE3) SetRGB(t,&f->color);
+      else SetRGBA(t,&f->color);
+      break;
+
+    case FILL_TILED:
+    case FILL_CLIPPED:
+      SetU16(t,f->id_bitmap);
+      SetMatrix(t,&f->m);
+      break;
+  }
+  
+  return 0;
+}
+
+int SetLineStyle(TAG * t,LINESTYLE * l)
+{ if ((!l)||(!t)) return -1;
+  SetU16(t,l->width);
+
+  if (GetTagID(t)!=ST_DEFINESHAPE3) SetRGB(t,&l->color);
+  else SetRGBA(t,&l->color);
+  
+  return 0;
+}
+
+int SetShapeStyleCount(TAG * t,U16 n)
+{ if (n>254)
+  { SetU8(t,0xff);
+    SetU16(t,n);
+    return 3;
+  }
+  else
+  { SetU8(t,n);
+    return 1;
+  }
+}
+
+int SetShapeStyles(TAG * t,SHAPE * s)
+{ int i,l;
+  if (!s) return -1;
+
+  l = 0;
+  l += SetShapeStyleCount(t,s->fillstyle.n);
+
+  for (i=0;i<s->fillstyle.n;i++)
+    l+=SetFillStyle(t,&s->fillstyle.data[i]);
+
+  l += SetShapeStyleCount(t,s->linestyle.n);
+
+  for (i=0;i<s->linestyle.n;i++)
+    l+=SetLineStyle(t,&s->linestyle.data[i]);
+
+  return l;
+}
+
+int ShapeCountBits(SHAPE * s,U8 * fbits,U8 * lbits)
+{ if (!s) return -1;
+    
+  s->bits.fill = CountBits(s->fillstyle.n,0);
+  s->bits.line = CountBits(s->linestyle.n,0);
+
+  if (fbits) fbits[0] = s->bits.fill;
+  if (lbits) lbits[0] = s->bits.line;
+  
+  return 0;    
+}
+
+int SetShapeBits(TAG * t,SHAPE * s)
+{ if ((!t)||(!s)) return -1;
+  ResetBitcount(t);
+  SetBits(t,s->bits.fill,4);
+  SetBits(t,s->bits.line,4);
+  return 0;
+}
+
+int SetShapeHeader(TAG * t,SHAPE * s)
+{ int res;
+  res = SetShapeStyles(t,s);
+  if (res>=0) res = ShapeCountBits(s,NULL,NULL);
+  if (res>=0) res = SetShapeBits(t,s);
+  return res;
+}
+
+int ShapeExport(int handle,SHAPE * s)  // without Linestyle/Fillstyle Record
+{ int l;
+  if (!s) return 0;
+
+  l = sizeof(SHAPE);
+
+  if (handle>=0)
+    if (write(handle,s,sizeof(SHAPE))!=sizeof(SHAPE)) return -1;
+
+  // Fillstyle, Linestyle ...
+
+  if (s->data)
+  { int ll = (s->bitlen+7)/8;
+    l+=ll;
+    if (handle>=0)
+      if (write(handle,s->data,ll)!=ll) return -1;
+  }
+
+  return l;
+}
+
+int ShapeImport(int handle,SHAPE * * shape)
+{ SHAPE * s;
+
+  if (handle<0) return -1;
+
+  s = (SHAPE *)malloc(sizeof(SHAPE)); shape[0] = s;
+  if (!s) return -1;
+
+  if (read(handle,s,sizeof(SHAPE))!=sizeof(SHAPE))
+  { shape[0] = NULL;
+    free(s);
+    return -1;
+  }
+
+  if (s->data)
+  { int ll = (s->bitlen+7)/8;
+    s->data = (U8*)malloc(ll);
+    if (!s->data)
+    { shape[0] = NULL;
+      free(s);
+      return -1;
+    }
+    if (read(handle,s->data,ll)!=ll)
+    { free(s->data);
+      free(s);
+      shape[0] = NULL;
+      return -1;
+    }
+  }
+
+  return 0;
+}
+
+int ShapeAddFillStyle(SHAPE * s,U8 type,MATRIX * m,RGBA * color,U16 id_bitmap)
+{ RGBA def_c;
+  MATRIX def_m;    
+
+  // 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;
+    GetMatrix(NULL,m);
+  }
+
+  // handle memory
+  
+  if (s->fillstyle.data)
+  { FILLSTYLE * new = (FILLSTYLE *)realloc(s->fillstyle.data,(s->fillstyle.n+1)*sizeof(FILLSTYLE));
+    if (!new) return -1;
+    s->fillstyle.data = new;
+  }
+  else
+  { s->fillstyle.data = (FILLSTYLE *)malloc(sizeof(FILLSTYLE));
+    s->fillstyle.n = 0;
+    if (!s->fillstyle.data) return -1;
+  }
+
+  // set fillstyle  (no gradients yet!)
+  
+  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));
+          
+  return (++s->fillstyle.n);
+}
+
+int ShapeAddSolidFillStyle(SHAPE * s,RGBA * color)
+{ return ShapeAddFillStyle(s,FILL_SOLID,NULL,color,0);
+}
+
+int ShapeAddBitmapFillStyle(SHAPE * s,MATRIX * m,U16 id_bitmap,int clip)
+{ return ShapeAddFillStyle(s,clip?FILL_CLIPPED:FILL_TILED,m,NULL,id_bitmap);
+}
+
+int 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 *)realloc(s->linestyle.data,(s->linestyle.n+1)*sizeof(LINESTYLE));
+    if (!new) return -1;
+    s->linestyle.data = new;
+  }
+  else
+  { s->linestyle.data = (LINESTYLE *)malloc(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 ShapeSetMove(TAG * t,SHAPE * s,S32 x,S32 y)
+{ U8 b;
+  if (!t) return -1;
+  SetBits(t,0,1);
+  SetBits(t,SF_MOVETO,5);
+  
+  b = CountBits(x,0);
+  b = CountBits(y,b);
+  
+  SetBits(t,b,5);
+  SetBits(t,x,b);
+  SetBits(t,y,b);
+
+  if (s)
+  { s->px = x;
+    s->py = y;
+  }
+  return 0;
+}
+
+int ShapeSetStyle(TAG * t,SHAPE * s,U16 line,U16 fill0,U16 fill1)
+{ if ((!t)||(!s)) return -1;
+    
+  SetBits(t,0,1);
+  SetBits(t,(line?SF_LINE:0)|(fill0?SF_FILL0:0)|(fill1?SF_FILL1:0),5);
+
+  if (fill0) SetBits(t,fill0,s->bits.fill);
+  if (fill1) SetBits(t,fill1,s->bits.fill);
+  if (line)  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 FILL_RESET 0x8000
+#define LINE_RESET 0x8000
+int ShapeSetAll(TAG * t,SHAPE * s,S32 x,S32 y,U16 line,U16 fill0,U16 fill1)
+{ U8 b;
+  if ((!t)||(!s)) return -1;
+
+  SetBits(t,0,1);
+  SetBits(t,SF_MOVETO|(line?SF_LINE:0)|(fill0?SF_FILL0:0)|(fill1?SF_FILL1:0),5);
+
+  b = CountBits(x,0);
+  b = CountBits(y,b);
+  SetBits(t,b,5);
+  SetBits(t,x,b);
+  SetBits(t,y,b);
+  s->px = x;
+  s->py = y;
+
+  if (fill0) SetBits(t,fill0,s->bits.fill);
+  if (fill1) SetBits(t,fill1,s->bits.fill);
+  if (line)  SetBits(t,line ,s->bits.line);
+  
+  return 0;
+}
+
+int ShapeSetEnd(TAG * t)
+{ if (!t) return -1;
+  SetBits(t,0,6);
+  ResetBitcount(t);
+  return 0;
+}
+
+int ShapeSetLine(TAG * t,SHAPE * s,S32 x,S32 y)
+{ U8 b;
+  if (!t) return -1;
+  SetBits(t,3,2); // Straight Edge
+
+  if ((!s)||((x!=0)&&(y!=0)))
+  { b = CountBits(x,2);
+    b = CountBits(y,b);
+    if(b<2) 
+	b=2;
+    SetBits(t, b-2, 4);
+    SetBits(t,1,1);
+    SetBits(t,x,b);
+    SetBits(t,y,b);
+    if (s)
+    { s->px += x;
+      s->py += y;
+    }
+    return 0;
+  }
+
+  if (x==0)
+  { b = CountBits(y,2);
+    if(b<2) 
+	b=2;
+    SetBits(t, b-2, 4);
+    SetBits(t,1,2);
+    SetBits(t,y,b);
+    s->py += y;
+  }
+  else
+  { b = CountBits(x,2);
+    if(b<2) 
+	b=2;
+    SetBits(t, b-2, 4);
+    SetBits(t,0,2);
+    SetBits(t,x,b);
+    s->px += x;
+  }
+  return 0;
+}
+
+int ShapeSetCurve(TAG * t,SHAPE * s,S32 x,S32 y,S32 ax,S32 ay)
+{ U8 b;
+  if (!t) return -1;
+
+  SetBits(t,2,2);
+
+  b = CountBits(ax,2);
+  b = CountBits(ay,b);
+  b = CountBits(x,b);
+  b = CountBits(y,b);
+
+  SetBits(t,b-2,4);
+  SetBits(t,x,b);
+  SetBits(t,y,b);
+  SetBits(t,ax,b);
+  SetBits(t,ay,b);
+
+  if (s)
+  { s->px += x+ax;
+    s->py += y+ay;
+  }
+  return 0;
+}
+
+int 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;
+  
+  ShapeSetMove(t,s,x+begin*rx,y+begin*ry);
+  ShapeSetCurve(t,s, -C1*rx,  C1*ry, -C2*rx,      0);
+  ShapeSetCurve(t,s, -C2*rx,      0, -C1*rx, -C1*ry);
+  ShapeSetCurve(t,s, -C1*rx, -C1*ry,      0, -C2*ry);
+  ShapeSetCurve(t,s,      0, -C2*ry,  C1*rx, -C1*ry);
+  ShapeSetCurve(t,s,  C1*rx, -C1*ry,  C2*rx,      0);
+  ShapeSetCurve(t,s,  C2*rx,      0,  C1*rx,  C1*ry);
+  ShapeSetCurve(t,s,  C1*rx,  C1*ry,      0,  C2*ry);
+  ShapeSetCurve(t,s,      0,  C2*ry, -C1*rx,  C1*ry);
+  
+  return 0;
+}
+