along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+#include "../rfxswf.h"
+
#define SF_MOVETO 0x01
#define SF_FILL0 0x02
#define SF_FILL1 0x04
return 3;
}
else
- { swf_SetU8(t,n);
+ { swf_SetU8(t,(U8)n);
return 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;
+ { FILLSTYLE * xnew = (FILLSTYLE *)rfx_realloc(s->fillstyle.data,(s->fillstyle.n+1)*sizeof(FILLSTYLE));
+ if (!xnew) return -1;
+ s->fillstyle.data = xnew;
}
else
{ s->fillstyle.data = (FILLSTYLE *)rfx_alloc(sizeof(FILLSTYLE));
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;
+ { LINESTYLE * xnew = (LINESTYLE *)rfx_realloc(s->linestyle.data,(s->linestyle.n+1)*sizeof(LINESTYLE));
+ if (!xnew) return -1;
+ s->linestyle.data = xnew;
}
else
{ s->linestyle.data = (LINESTYLE *)rfx_alloc(sizeof(LINESTYLE));
b = swf_CountBits(x,0);
b = swf_CountBits(y,b);
-
+
+ if(b>31) {
+ fprintf(stderr, "Warning: bad moveTo (%f,%f)\n", x/20.0, y/20.0);
+ b=31;
+ }
+
swf_SetBits(t,b,5);
swf_SetBits(t,x,b);
swf_SetBits(t,y,b);
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);
+ if(b > 18 + 6) {
+ /* do not split into more than 64 segments. If the line is *that* long, something's broken */
+ fprintf(stderr, "Warning: Line to %.2f,%.2f is too long (%d bits)\n", (double)x,(double)y, b);
return -1;
} else {
/* split line */
if(b >= 18) {
fprintf(stderr, "Bit overflow in swf_ShapeSetCurve- %d (%d,%d,%d,%d)\n", b, ax,ay,x,y);
- b = 17;
+ return swf_ShapeSetLine(t, s, x+ax, y+ay);
}
swf_SetBits(t,2,2);
// from swftools.c:
void enumerateUsedIDs_styles(TAG * tag, void (*callback)(TAG*, int, void*), void*callback_data, int num, int morph);
-static void parseFillStyleArray(TAG*tag, SHAPE2*shape)
+static void parseFillStyle(FILLSTYLE*dest, TAG*tag, int num)
+{
+ int type = swf_GetU8(tag); //type
+ dest->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 == 0x11 || type == 0x12 || type == 0x13)
+ {
+ /* linear/radial gradient fill */
+ swf_ResetReadBits(tag);
+ swf_GetMatrix(tag, &dest->m);
+ swf_ResetReadBits(tag);
+ swf_GetGradient(tag, &dest->gradient, num>=3?1:0);
+ if(type == 0x13)
+ swf_GetU16(tag);
+ }
+ else if(type == 0x40 || type == 0x41 || type == 0x42 || type == 0x43)
+ {
+ /* bitmap fill */
+ swf_ResetReadBits(tag);
+ dest->id_bitmap = swf_GetU16(tag); //id
+ swf_ResetReadBits(tag); //?
+ swf_GetMatrix(tag, &dest->m);
+ }
+ else {
+ fprintf(stderr, "rfxswf:swfshape.c Unknown fillstyle:0x%02x in tag %02d\n",type, tag->id);
+ }
+}
+static int parseFillStyleArray(TAG*tag, SHAPE2*shape)
{
U16 count;
int t;
num = 2;
else if(tag->id == ST_DEFINESHAPE3)
num = 3;
+ else if(tag->id == ST_DEFINESHAPE4)
+ num = 4;
count = swf_GetU8(tag);
if(count == 0xff && num>1) // defineshape2,3 only
shape->numfillstyles += count;
if(shape->numfillstyles) {
- shape->fillstyles = rfx_realloc(shape->fillstyles, sizeof(FILLSTYLE)*shape->numfillstyles);
+ shape->fillstyles = (FILLSTYLE*)rfx_realloc(shape->fillstyles, sizeof(FILLSTYLE)*shape->numfillstyles);
- for(t=fillstylestart;t<shape->numfillstyles;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);
- }
+ for(t=fillstylestart;t<shape->numfillstyles;t++) {
+ parseFillStyle(&shape->fillstyles[t], tag, num);
}
}
shape->numlinestyles += count;
if(count) {
- shape->linestyles = rfx_realloc(shape->linestyles, sizeof(LINESTYLE)*shape->numlinestyles);
+ shape->linestyles = (LINESTYLE*)rfx_realloc(shape->linestyles, sizeof(LINESTYLE)*shape->numlinestyles);
/* TODO: should we start with 1 and insert a correct definition of the
"built in" linestyle 0? */
for(t=linestylestart;t<shape->numlinestyles;t++)
{
+ char fill = 0;
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);
+
+ if(num >= 4) {
+ U16 flags = swf_GetU16(tag);
+ if((flags & 0x30) == 0x20)
+ swf_GetU16(tag); // miter limit
+ if(flags & 0x08) {
+ fprintf(stderr, "Warning: Filled strokes parsing not yet fully supported\n");
+ fill = 1;
+ }
+ }
+
+ if(fill) {
+ FILLSTYLE f;
+ parseFillStyle(&f, tag, num);
+ shape->linestyles[t].color = f.color;
+ } else {
+ if(num >= 3)
+ swf_GetRGBA(tag, &shape->linestyles[t].color);
+ else
+ swf_GetRGB(tag, &shape->linestyles[t].color);
+ }
}
}
- return;
+ return 1;
}
+char swf_ShapeIsEmpty(SHAPE*s)
+{
+ if(!s || !s->data) return 1;
+ TAG _tag;
+ TAG* tag = &_tag;
+ memset(tag, 0, sizeof(TAG));
+ tag->data = s->data;
+ tag->len = tag->memsize = (s->bitlen+7)/8;
+ tag->pos = 0;
+
+ while(1) {
+ if(!swf_GetBits(tag, 1)) {
+ U16 flags = swf_GetBits(tag, 5);
+ if(!flags) break;
+ if(flags&1) { //move
+ int n = swf_GetBits(tag, 5);
+ swf_GetSBits(tag, n); //x
+ swf_GetSBits(tag, n); //y
+ }
+ if(flags&2) swf_GetBits(tag, s->bits.fill);
+ if(flags&4) swf_GetBits(tag, s->bits.fill);
+ if(flags&8) swf_GetBits(tag, s->bits.line);
+ if(flags&16) {return 0;}
+ } else {
+ return 0;
+ }
+ }
+ return 1;
+}
/* todo: merge this with swf_GetSimpleShape */
static SHAPELINE* swf_ParseShapeData(U8*data, int bits, int fillbits, int linebits, int version, SHAPE2*shape2)
tag->data = data;
tag->len = tag->memsize = (bits+7)/8;
tag->pos = 0;
- tag->id = version==1?ST_DEFINESHAPE:(version==2?ST_DEFINESHAPE2:ST_DEFINESHAPE3);
+ tag->id = version==1?ST_DEFINESHAPE:(version==2?ST_DEFINESHAPE2:(version==3?ST_DEFINESHAPE3:ST_DEFINESHAPE4));
lines->next = 0;
while(1) {
} else {
linestyleadd = shape2->numlinestyles;
fillstyleadd = shape2->numfillstyles;
- parseFillStyleArray(tag, shape2);
+ if(!parseFillStyleArray(tag, shape2))
+ return 0;
}
fillbits = swf_GetBits(tag, 4);
linebits = swf_GetBits(tag, 4);
{
SHAPELINE*line = s->lines;
SHAPELINE*prev = 0;
- SHAPE2*s2 = rfx_alloc(sizeof(SHAPE2));
+ SHAPE2*s2 = (SHAPE2*)rfx_alloc(sizeof(SHAPE2));
memcpy(s2,s,sizeof(SHAPE2));
- s2->linestyles = rfx_alloc(sizeof(LINESTYLE)*s->numlinestyles);
+ s2->linestyles = (LINESTYLE*)rfx_alloc(sizeof(LINESTYLE)*s->numlinestyles);
memcpy(s2->linestyles, s->linestyles, sizeof(LINESTYLE)*s->numlinestyles);
- s2->fillstyles = rfx_alloc(sizeof(FILLSTYLE)*s->numfillstyles);
+ s2->fillstyles = (FILLSTYLE*)rfx_alloc(sizeof(FILLSTYLE)*s->numfillstyles);
memcpy(s2->fillstyles, s->fillstyles, sizeof(FILLSTYLE)*s->numfillstyles);
while(line) {
- SHAPELINE*line2 = rfx_alloc(sizeof(SHAPELINE));
+ SHAPELINE*line2 = (SHAPELINE*)rfx_alloc(sizeof(SHAPELINE));
memcpy(line2, line, sizeof(SHAPELINE));
line2->next = 0;
if(prev)
line = line->next;
}
if(s->bbox) {
- s2->bbox = rfx_alloc(sizeof(SRECT));
+ s2->bbox = (SRECT*)rfx_alloc(sizeof(SRECT));
memcpy(s2->bbox, s->bbox, sizeof(SRECT));
}
return s2;
swf_ShapeFree(shape);
}
+void swf_ShapeSetRectangle(TAG*tag, U16 shapeid, int width, int height, RGBA*rgba)
+{
+ RGBA white={255,255,255,255};
+ if(!rgba) {
+ rgba = &white;
+ }
+ SHAPE* s;
+ swf_ShapeNew(&s);
+ int fs = swf_ShapeAddSolidFillStyle(s, rgba);
+ swf_SetU16(tag,shapeid);
+ SRECT r;
+ r.xmin = 0;
+ r.xmax = 0;
+ r.ymin = width;
+ r.ymax = height;
+ swf_SetRect(tag,&r);
+ swf_SetShapeHeader(tag,s);
+ swf_ShapeSetAll(tag,s,0,0,0,fs,0);
+ swf_ShapeSetLine(tag,s,width,0);
+ swf_ShapeSetLine(tag,s,0,height);
+ swf_ShapeSetLine(tag,s,-width,0);
+ swf_ShapeSetLine(tag,s,0,-height);
+ swf_ShapeSetEnd(tag);
+ swf_ShapeFree(s);
+}
+
+void swf_ShapeSetRectangleWithBorder(TAG*tag, U16 shapeid, int width, int height, RGBA*rgba, int linewidth, RGBA*linecolor)
+{
+ RGBA white={255,255,255,255};
+ if(!rgba) {
+ rgba = &white;
+ }
+ SHAPE* s;
+ swf_ShapeNew(&s);
+ int fs = swf_ShapeAddSolidFillStyle(s, rgba);
+ int ls = swf_ShapeAddLineStyle(s, linewidth, linecolor);
+ swf_SetU16(tag,shapeid);
+ SRECT r;
+ r.xmin = 0;
+ r.xmax = 0;
+ r.ymin = width;
+ r.ymax = height;
+ swf_SetRect(tag,&r);
+ swf_SetShapeHeader(tag,s);
+ swf_ShapeSetAll(tag,s,0,0,ls,fs,0);
+ swf_ShapeSetLine(tag,s,width,0);
+ swf_ShapeSetLine(tag,s,0,height);
+ swf_ShapeSetLine(tag,s,-width,0);
+ swf_ShapeSetLine(tag,s,0,-height);
+ swf_ShapeSetEnd(tag);
+ swf_ShapeFree(s);
+}
+
void swf_Shape2ToShape(SHAPE2*shape2, SHAPE*shape)
{
TAG*tag = swf_InsertTag(0,0);
- SHAPELINE*l,*next;
+ SHAPELINE*l;
int newx=0,newy=0,lastx=0,lasty=0,oldls=0,oldfs0=0,oldfs1=0;
memset(shape, 0, sizeof(SHAPE));
swf_ShapeSetEnd(tag);
shape->data = tag->data;
shape->bitlen = tag->len*8;
+ free(tag);
}
void swf_SetShape2(TAG*tag, SHAPE2*shape2)
{
int num = 0, id;
U16 fill,line;
- SRECT r;
- SRECT r2;
SHAPELINE*l;
if(tag->id == ST_DEFINESHAPE)
num = 1;
num = 2;
else if(tag->id == ST_DEFINESHAPE3)
num = 3;
+ else if(tag->id == ST_DEFINESHAPE4)
+ num = 4;
else {
fprintf(stderr, "parseDefineShape must be called with a shape tag");
}
id = swf_GetU16(tag); //id
memset(shape, 0, sizeof(SHAPE2));
- shape->bbox = rfx_alloc(sizeof(SRECT));
+ shape->bbox = (SRECT*)rfx_alloc(sizeof(SRECT));
swf_GetRect(tag, shape->bbox);
+ if(num>=4) {
+ SRECT r2;
+ swf_ResetReadBits(tag);
+ swf_GetRect(tag, &r2); // edge bounds
+ U8 flags = swf_GetU8(tag); // flags, &1: contains scaling stroke, &2: contains non-scaling stroke
+ }
- parseFillStyleArray(tag, shape);
+ if(!parseFillStyleArray(tag, shape)) {
+ return;
+ }
swf_ResetReadBits(tag);
fill = (U16)swf_GetBits(tag,4);
line = (U16)swf_GetBits(tag,4);
+ if(!fill && !line) {
+ fprintf(stderr, "fill/line bits are both zero\n");
+ }
- shape->lines = swf_ParseShapeData(&tag->data[tag->pos], (tag->len - tag->pos)*8, fill, line,
- tag->id == ST_DEFINESHAPE?1:(tag->id==ST_DEFINESHAPE2?2:3), shape);
+ shape->lines = swf_ParseShapeData(&tag->data[tag->pos], (tag->len - tag->pos)*8, fill, line, num, shape);
l = shape->lines;
}
+static void free_lines(SHAPELINE* lines)
+{
+ if (lines->next)
+ free_lines(lines->next);
+ free(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)
{
s2.lines = swf_ParseShapeData(data, bitlen, in_bits_fill, in_bits_line, 1, 0);
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);
+ s2.fillstyles = (FILLSTYLE*)rfx_calloc(sizeof(FILLSTYLE)*s2.numfillstyles);
+ s2.linestyles = (LINESTYLE*)rfx_calloc(sizeof(LINESTYLE)*s2.numlinestyles);
line = s2.lines;
while(line) {
swf_Shape2ToShape(&s2,&s);
+ free_lines(s2.lines);
free(s2.fillstyles);
free(s2.linestyles);
free(s.fillstyle.data);
git.asbjorn.biz / swftools.git / blobdiff