// swfdraw.c
+#include "../rfxswf.h"
+
typedef struct _SWFSHAPEDRAWER
{
SHAPE*shape;
static void swf_ShapeDrawerInit(drawer_t*draw, TAG*tag, int fillstylebits, int linestylebits)
{
- SWFSHAPEDRAWER*sdraw = malloc(sizeof(SWFSHAPEDRAWER));
- memset(sdraw, 0, sizeof(SWFSHAPEDRAWER));
+ SWFSHAPEDRAWER*sdraw = (SWFSHAPEDRAWER*)rfx_calloc(sizeof(SWFSHAPEDRAWER));
draw->internal = sdraw;
draw->setLineStyle = swf_ShapeDrawerSetLineStyle;
static void swf_ShapeDrawerMoveTo(drawer_t*draw, FPOINT * to)
{
SWFSHAPEDRAWER*sdraw = (SWFSHAPEDRAWER*)draw->internal;
- int x = to->x*20;
- int y = to->y*20;
+ int x = to->x*20+0.001;
+ int y = to->y*20+0.001;
/* we need to write moveto always- it
might be that it signals the end of a polygon, otherwise
static void swf_ShapeDrawerLineTo(drawer_t*draw, FPOINT * to)
{
SWFSHAPEDRAWER*sdraw = (SWFSHAPEDRAWER*)draw->internal;
- int x = to->x*20;
- int y = to->y*20;
+ int x = to->x*20+0.001;
+ int y = to->y*20+0.001;
if(sdraw->lastx < sdraw->bbox.xmin) sdraw->bbox.xmin = sdraw->lastx;
if(sdraw->lasty < sdraw->bbox.ymin) sdraw->bbox.ymin = sdraw->lasty;
if(sdraw->lastx > sdraw->bbox.xmax) sdraw->bbox.xmax = sdraw->lastx;
static void swf_ShapeDrawerSplineTo(drawer_t*draw, FPOINT * c1, FPOINT* to)
{
SWFSHAPEDRAWER*sdraw = (SWFSHAPEDRAWER*)draw->internal;
- int tx = c1->x*20;
- int ty = c1->y*20;
- int x = to->x*20;
- int y = to->y*20;
+ int tx = c1->x*20+0.001;
+ int ty = c1->y*20+0.001;
+ int x = to->x*20+0.001;
+ int y = to->y*20+0.001;
if(sdraw->lastx < sdraw->bbox.xmin) sdraw->bbox.xmin = sdraw->lastx;
if(sdraw->lasty < sdraw->bbox.ymin) sdraw->bbox.ymin = sdraw->lasty;
if(sdraw->lastx > sdraw->bbox.xmax) sdraw->bbox.xmax = sdraw->lastx;
{
SWFSHAPEDRAWER*sdraw = (SWFSHAPEDRAWER*)draw->internal;
if(sdraw->tagfree) {
- swf_DeleteTag(sdraw->tag);
+ swf_DeleteTag(0, sdraw->tag);
sdraw->tag = 0;
}
swf_ShapeFree(sdraw->shape);
sdraw->shape = 0;
- free(draw->internal);
+ rfx_free(draw->internal);
draw->internal = 0;
}
SHAPE* swf_ShapeDrawerToShape(drawer_t*draw)
{
SWFSHAPEDRAWER*sdraw = (SWFSHAPEDRAWER*)draw->internal;
- SHAPE* shape = malloc(sizeof(SHAPE));
+ SHAPE* shape = (SHAPE*)rfx_alloc(sizeof(SHAPE));
if(!sdraw->isfinished) {
fprintf(stderr, "Warning: you should Finish() your drawer before calling DrawerToShape");
swf_ShapeDrawerFinish(draw);
}
memcpy(shape, sdraw->shape, sizeof(SHAPE));
shape->bitlen = (sdraw->tag->len-1)*8;
- shape->data = (U8*)malloc(sdraw->tag->len-1);
+ shape->data = (U8*)rfx_alloc(sdraw->tag->len-1);
memcpy(shape->data, &sdraw->tag->data[1], sdraw->tag->len-1);
return shape;
}