X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=lib%2Fmodules%2Fswfdraw.c;h=66f169c30f34dfdba2abd5584829878a90fd8ee0;hp=723b253dbd0b12c07eceb6094c882354c22c6c2d;hb=8526dcf3a698c688e2cc4430ae106b5ecf70677f;hpb=cbc6baaa2cbb83ceb6f13be79051bcceaaa462f3 diff --git a/lib/modules/swfdraw.c b/lib/modules/swfdraw.c index 723b253..66f169c 100644 --- a/lib/modules/swfdraw.c +++ b/lib/modules/swfdraw.c @@ -23,8 +23,7 @@ static void swf_ShapeDrawerClear(drawer_t*draw); 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 = rfx_calloc(sizeof(SWFSHAPEDRAWER)); draw->internal = sdraw; draw->setLineStyle = swf_ShapeDrawerSetLineStyle; @@ -184,7 +183,7 @@ static void swf_ShapeDrawerClear(drawer_t*draw) swf_ShapeFree(sdraw->shape); sdraw->shape = 0; - free(draw->internal); + rfx_free(draw->internal); draw->internal = 0; } @@ -197,14 +196,14 @@ SRECT swf_ShapeDrawerGetBBox(drawer_t*draw) SHAPE* swf_ShapeDrawerToShape(drawer_t*draw) { SWFSHAPEDRAWER*sdraw = (SWFSHAPEDRAWER*)draw->internal; - SHAPE* shape = malloc(sizeof(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; }