X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fdevices%2Fops.c;h=83429309b6f108e949f16a3adede7b0ae721b735;hb=0784a8a882e7b98299fb6a90f0f9a7ebb322562b;hp=911bc477bad163493bbcc3c89305f83cdc4e790c;hpb=4c732fe232f3ce785cc1e553aaefbf0f24eabee4;p=swftools.git diff --git a/lib/devices/ops.c b/lib/devices/ops.c index 911bc47..8342930 100644 --- a/lib/devices/ops.c +++ b/lib/devices/ops.c @@ -21,12 +21,16 @@ #include #include #include +#ifndef WIN32 #include +#endif #include +#include #include "../types.h" #include "../mem.h" #include "../gfxdevice.h" #include "../gfxtools.h" +#include "ops.h" typedef struct _internal { gfxdevice_t*out; @@ -110,7 +114,7 @@ void ops_fillbitmap(struct _gfxdevice*dev, gfxline_t*line, gfximage_t*img, gfxma gfximage_t img2; img2.width = img->width; img2.height = img->height; - img2.data = malloc(img->width*img->height*4); + img2.data = (gfxcolor_t*)malloc(img->width*img->height*4); int x,y; for(y=0;yheight;y++) { gfxcolor_t*in = &img->data[y*img->width]; @@ -142,7 +146,7 @@ void ops_drawchar(struct _gfxdevice*dev, gfxfont_t*font, int glyphnr, gfxcolor_t i->out->drawchar(i->out, font, glyphnr, color, matrix); } -void ops_drawlink(struct _gfxdevice*dev, gfxline_t*line, char*action) +void ops_drawlink(struct _gfxdevice*dev, gfxline_t*line, const char*action) { internal_t*i = (internal_t*)dev->internal; i->out->drawlink(i->out, line, action);