#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) rfx_free(s->linestyle.data);
s->linestyle.data = NULL;
s->linestyle.n = 0;
- if (s->fillstyle.data) free(s->fillstyle.data);
+ if (s->fillstyle.data) rfx_free(s->fillstyle.data);
s->fillstyle.data = NULL;
s->fillstyle.n = 0;
- if (s->data) free(s->data);
+ if (s->data) rfx_free(s->data);
s->data = NULL;
- }
- free(s);
+ rfx_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 *)rfx_calloc(sizeof(SHAPE));
+ *s = sh;
+ return 0;
}
int swf_GetSimpleShape(TAG * t,SHAPE * * s) // without Linestyle/Fillstyle Record
swf_SetTagPos(t,pos);
len = (bitl+7)/8;
- if (sh->data) free(sh->data);
- sh->data = (U8*)malloc(len);
+ if (sh->data) rfx_free(sh->data);
+ sh->data = (U8*)rfx_alloc(len);
if (sh->data)
{ sh->bitlen = bitl;
{ 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);
// handle memory
if (s->fillstyle.data)
- { FILLSTYLE * new = (FILLSTYLE *)realloc(s->fillstyle.data,(s->fillstyle.n+1)*sizeof(FILLSTYLE));
+ { 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 *)malloc(sizeof(FILLSTYLE));
+ { s->fillstyle.data = (FILLSTYLE *)rfx_alloc(sizeof(FILLSTYLE));
s->fillstyle.n = 0;
if (!s->fillstyle.data) return -1;
}
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);
def.r = def.g = def.b = 0;
}
if (s->linestyle.data)
- { LINESTYLE * new = (LINESTYLE *)realloc(s->linestyle.data,(s->linestyle.n+1)*sizeof(LINESTYLE));
+ { 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 *)malloc(sizeof(LINESTYLE));
+ { s->linestyle.data = (LINESTYLE *)rfx_alloc(sizeof(LINESTYLE));
s->linestyle.n = 0;
if (!s->linestyle.data) return -1;
}
}
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 (%d,%d)\n", b, x,y);
- fflush(stdout);
- 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\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;
+ }
}
- 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 (%d)\n", b, y);
- 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,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 (%d)\n", b, x);
- b = 17;
- }
- 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)
linebits = swf_GetBits(tag, 4);
}
if(flags&1) { //move
- lines->next = (SHAPELINE*)malloc(sizeof(SHAPELINE));
+ lines->next = (SHAPELINE*)rfx_alloc(sizeof(SHAPELINE));
lines = lines->next;
lines->type = moveTo;
lines->x = x;
if(v) y += d;
else x += d;
}
- lines->next = (SHAPELINE*)malloc(sizeof(SHAPELINE));
+ lines->next = (SHAPELINE*)rfx_alloc(sizeof(SHAPELINE));
lines = lines->next;
lines->type = lineTo;
lines->x = x;
x += swf_GetSBits(tag, n);
y += swf_GetSBits(tag, n);
- lines->next = (SHAPELINE*)malloc(sizeof(SHAPELINE));
+ lines->next = (SHAPELINE*)rfx_alloc(sizeof(SHAPELINE));
lines = lines->next;
lines->type = splineTo;
lines->sx = x1;
SHAPELINE*line = s->lines;
while(line) {
SHAPELINE*next = line->next;
- free(line);
+ rfx_free(line);
line = next;
}
if(s->linestyles)
- free(s->linestyles);
+ rfx_free(s->linestyles);
if(s->fillstyles)
- free(s->fillstyles);
+ rfx_free(s->fillstyles);
if(s->bbox)
- free(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*)malloc(sizeof(SHAPE2));
+ SHAPE2*shape2 = (SHAPE2*)rfx_calloc(sizeof(SHAPE2));
shape2->numlinestyles = shape->linestyle.n;
- shape2->linestyles = (LINESTYLE*)malloc(sizeof(LINESTYLE)*shape->linestyle.n);
- memcpy(shape2->linestyles, shape->linestyle.data, sizeof(LINESTYLE)*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;
- shape2->fillstyles = (FILLSTYLE*)malloc(sizeof(FILLSTYLE)*shape->fillstyle.n);
- memcpy(shape2->fillstyles, shape->fillstyle.data, sizeof(FILLSTYLE)*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;
memset(shape, 0, sizeof(SHAPE));
shape->linestyle.n = shape2->numlinestyles;
- shape->linestyle.data = (LINESTYLE*)malloc(sizeof(LINESTYLE)*shape->linestyle.n);
+ 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*)malloc(sizeof(FILLSTYLE)*shape->fillstyle.n);
+ 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);
swf_SetRect(tag,shape2->bbox);
swf_SetShapeStyles(tag, &shape);
- swf_ShapeCountBits(&shape,NULL,NULL);
+ //swf_ShapeCountBits(&shape,NULL,NULL); // done in swf_Shape2ToShape()
swf_SetShapeBits(tag,&shape);
swf_SetBlock(tag, shape.data, (shape.bitlen+7)/8);
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);
- }
+
+ 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)
//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);
+ 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;
}
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 = malloc(sizeof(SRECT));
+ shape->bbox = rfx_alloc(sizeof(SRECT));
swf_GetRect(tag, &r);
memcpy(shape->bbox, &r, sizeof(SRECT));
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;
+}
+
git.asbjorn.biz / swftools.git / blobdiff