X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fmodules%2Fswfshape.c;h=cbc138939572dcca53cca3f8e64fbc27f6d81b50;hb=c9547ee5f58fc8b95db19b3a0c70b095dbc8d987;hp=100132729679d9f07897efbbe75804be37f6ea0a;hpb=74021a5785a3b96e71a515d25fb91cd4e8cbbea9;p=swftools.git

diff --git a/lib/modules/swfshape.c b/lib/modules/swfshape.c
index 1001327..cbc1389 100644
--- a/lib/modules/swfshape.c
+++ b/lib/modules/swfshape.c
@@ -27,15 +27,11 @@
 #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 swf_ShapeFree(SHAPE * s)
-{ if (s)
-  { if (s->linestyle.data) free(s->linestyle.data);
+{ 
+    if(!s)
+        return;
+    if (s->linestyle.data) free(s->linestyle.data);
     s->linestyle.data = NULL;
     s->linestyle.n    = 0;
     if (s->fillstyle.data) free(s->fillstyle.data);
@@ -43,16 +39,17 @@ void swf_ShapeFree(SHAPE * s)
     s->fillstyle.n    = 0;
     if (s->data) free(s->data);
     s->data = NULL;
-  }
-  free(s);
+    free(s);
 }
 
 int swf_ShapeNew(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;
+{ 
+    SHAPE * sh;
+    if (!s) return -1;
+    sh = (SHAPE *)malloc(sizeof(SHAPE)); 
+    *s = sh;
+    memset(sh,0,sizeof(SHAPE));
+    return 0;
 }
 
 int swf_GetSimpleShape(TAG * t,SHAPE * * s) // without Linestyle/Fillstyle Record
@@ -169,8 +166,6 @@ int swf_SetFillStyle(TAG * t,FILLSTYLE * f)
 { if ((!t)||(!f)) return -1;
   swf_SetU8(t,f->type);
   
-  // no gradients yet!
-  
   switch (f->type)
   { case FILL_SOLID:
       if (swf_GetTagID(t)!=ST_DEFINESHAPE3) swf_SetRGB(t,&f->color);
@@ -293,7 +288,7 @@ int swf_ShapeAddFillStyle(SHAPE * s,U8 type,MATRIX * m,RGBA * color,U16 id_bitma
     if (!s->fillstyle.data) return -1;
   }
 
-  // set fillstyle  (no gradients yet!)
+  // set fillstyle
   
   s->fillstyle.data[s->fillstyle.n].type = type; 
   s->fillstyle.data[s->fillstyle.n].id_bitmap = id_bitmap;
@@ -412,72 +407,73 @@ int swf_ShapeSetEnd(TAG * t)
 }
 
 int swf_ShapeSetLine(TAG * t,SHAPE * s,S32 x,S32 y)
-{ U8 b;
-  if (!t) return -1;
-  swf_SetBits(t,3,2); // Straight Edge
-
-  if ((!s)||((x!=0)&&(y!=0)))
-  { b = swf_CountBits(x,2);
+{ 
+    U8 b;
+    if (!t) return -1;
+   
+    b = swf_CountBits(x,2);
     b = swf_CountBits(y,b);
     if (b<2) b=2;
-    if(b-2 >= 16) {
-	fprintf(stderr, "Bit overflow in swf_ShapeSetLine(1)- %d\n", b);
-	fflush(stdout);
-	*(int*)0 = 0xdead;
-	b = 17;
+    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", (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;
+        }
     }
-    swf_SetBits(t, b-2, 4);
-    swf_SetBits(t,1,1);
-    swf_SetBits(t,x,b);
-    swf_SetBits(t,y,b);
-    return 0;
-  }
 
-  if (x==0)
-  { b = swf_CountBits(y,2);
-    if(b<2) 
-        b=2;
-    if(b-2 >= 16) {
-	fprintf(stderr, "Bit overflow in swf_ShapeSetLine(2)- %d\n", b);
-	b = 17;
-    }
-    swf_SetBits(t, b-2, 4);
-    swf_SetBits(t,1,2);
-    swf_SetBits(t,y,b);
-  } 
-  else
-  { b = swf_CountBits(x,2);
-    if(b<2) 
-        b=2;
-    if(b-2 >= 16) {
-	fprintf(stderr, "Bit overflow in swf_ShapeSetLine(3)- %d\n", b);
-	b = 17;
+    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);
     }
-    swf_SetBits(t, b-2, 4);
-    swf_SetBits(t,0,2);
-    swf_SetBits(t,x,b);
-  }
-  return 0;
+    return 0;
 }
 
 int swf_ShapeSetCurve(TAG * t,SHAPE * s,S32 x,S32 y,S32 ax,S32 ay)
-{ U8 b;
-  if (!t) return -1;
-
-  swf_SetBits(t,2,2);
+{ 
+    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);
+    b = swf_CountBits(ax,2);
+    b = swf_CountBits(ay,b);
+    b = swf_CountBits(x,b);
+    b = swf_CountBits(y,b);
 
-  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);
+    if(b >= 18) {
+          fprintf(stderr, "Bit overflow in swf_ShapeSetCurve- %d (%d,%d,%d,%d)\n", b, ax,ay,x,y);
+          b = 17;
+    }
 
-  return 0;
+    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)
@@ -611,8 +607,6 @@ SRECT swf_GetShapeBoundingBox(SHAPE2*shape2)
 {
     SRECT r;
     SHAPELINE*l = shape2->lines;
-    int SCOORD_MAX = 0x7fffffff;
-    int SCOORD_MIN = -0x80000000;
     int lastx=0,lasty=0;
     int valid = 0;
     r.xmin = r.ymin = SCOORD_MAX;
@@ -722,3 +716,179 @@ void swf_ShapeSetBitmapRect(TAG*tag, U16 gfxid, int width, int height)
     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*)malloc(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*)malloc(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);
+    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;
+    shape->fillstyles = malloc(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;
+    shape->linestyles = malloc(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");
+    }
+
+    id = swf_GetU16(tag); //id
+    memset(shape, 0, sizeof(SHAPE2));
+    shape->bbox = malloc(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;
+}
+