From 851e4288c102cc4177d54d87aded43d003e85885 Mon Sep 17 00:00:00 2001 From: Bert Münnich Date: Wed, 28 Oct 2015 22:29:01 +0100 Subject: Prefix safe allocation functions with 'e' instead of 's_' --- image.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'image.c') diff --git a/image.c b/image.c index 4f49107..494ff07 100644 --- a/image.c +++ b/image.c @@ -138,7 +138,7 @@ bool img_load_gif(img_t *img, const fileinfo_t *file) if (img->multi.cap == 0) { img->multi.cap = 8; img->multi.frames = (img_frame_t*) - s_malloc(sizeof(img_frame_t) * img->multi.cap); + emalloc(sizeof(img_frame_t) * img->multi.cap); } img->multi.cnt = img->multi.sel = 0; img->multi.length = 0; @@ -190,9 +190,9 @@ bool img_load_gif(img_t *img, const fileinfo_t *file) w = gif->Image.Width; h = gif->Image.Height; - rows = (GifRowType*) s_malloc(h * sizeof(GifRowType)); + rows = (GifRowType*) emalloc(h * sizeof(GifRowType)); for (i = 0; i < h; i++) - rows[i] = (GifRowType) s_malloc(w * sizeof(GifPixelType)); + rows[i] = (GifRowType) emalloc(w * sizeof(GifPixelType)); if (gif->Image.Interlace) { for (i = 0; i < 4; i++) { for (j = intoffset[i]; j < h; j += intjump[i]) @@ -203,7 +203,7 @@ bool img_load_gif(img_t *img, const fileinfo_t *file) DGifGetLine(gif, rows[i], w); } - ptr = data = (DATA32*) s_malloc(sizeof(DATA32) * sw * sh); + ptr = data = (DATA32*) emalloc(sizeof(DATA32) * sw * sh); cmap = gif->Image.ColorMap ? gif->Image.ColorMap : gif->SColorMap; r = cmap->Colors[bg].Red; g = cmap->Colors[bg].Green; @@ -257,8 +257,8 @@ bool img_load_gif(img_t *img, const fileinfo_t *file) if (img->multi.cnt == img->multi.cap) { img->multi.cap *= 2; img->multi.frames = (img_frame_t*) - s_realloc(img->multi.frames, - img->multi.cap * sizeof(img_frame_t)); + erealloc(img->multi.frames, + img->multi.cap * sizeof(img_frame_t)); } img->multi.frames[img->multi.cnt].im = im; img->multi.frames[img->multi.cnt].delay = delay > 0 ? delay : DEF_GIF_DELAY; -- cgit v1.2.3-54-g00ecf