From 960deb823f1e5a0d11ff01dd95273d7e091e98f1 Mon Sep 17 00:00:00 2001 From: Robert Swain Date: Sun, 27 Jun 2010 17:46:44 +0200 Subject: [PATCH] cog: Use g_malloc() instead of malloc() malloc() needs stdlib.h, which isn't included here and the memory is freed later with g_free() anyway. --- ext/cog/cogframe.c | 2 +- ext/cog/cogvirtframe.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ext/cog/cogframe.c b/ext/cog/cogframe.c index 1116649bf0..8da9206e06 100644 --- a/ext/cog/cogframe.c +++ b/ext/cog/cogframe.c @@ -146,7 +146,7 @@ cog_frame_new_and_alloc_extended (CogMemoryDomain * domain, frame->components[2].v_shift = v_shift; frame->components[2].h_shift = h_shift; - frame->regions[0] = malloc (frame->components[0].length + + frame->regions[0] = g_malloc (frame->components[0].length + frame->components[1].length + frame->components[2].length); frame->components[0].data = COG_OFFSET (frame->regions[0], diff --git a/ext/cog/cogvirtframe.c b/ext/cog/cogvirtframe.c index f5dc1f6fad..f1faa8e5cc 100644 --- a/ext/cog/cogvirtframe.c +++ b/ext/cog/cogvirtframe.c @@ -52,7 +52,7 @@ cog_frame_new_virtual (CogMemoryDomain * domain, CogFrameFormat format, frame->components[0].h_shift = 0; frame->regions[0] = - malloc (frame->components[0].stride * COG_FRAME_CACHE_SIZE); + g_malloc (frame->components[0].stride * COG_FRAME_CACHE_SIZE); for (i = 0; i < COG_FRAME_CACHE_SIZE; i++) { frame->cached_lines[0][i] = 0; } @@ -114,7 +114,7 @@ cog_frame_new_virtual (CogMemoryDomain * domain, CogFrameFormat format, CogFrameData *comp = &frame->components[i]; int j; - frame->regions[i] = malloc (comp->stride * COG_FRAME_CACHE_SIZE); + frame->regions[i] = g_malloc (comp->stride * COG_FRAME_CACHE_SIZE); for (j = 0; j < COG_FRAME_CACHE_SIZE; j++) { frame->cached_lines[i][j] = 0; }