From 3bcd5d3f982df07bd782ff946b46b24f0a4fc83a Mon Sep 17 00:00:00 2001 From: Robert Bragg Date: Tue, 29 Apr 2008 12:44:41 +0000 Subject: [PATCH] 2008-04-29 Robert Bragg * clutter/cogl/gles/cogl-texture.c: Replaces an malloc call with g_malloc. --- ChangeLog | 5 +++++ clutter/cogl/gles/cogl-texture.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ed6b8c378..15f34f8ab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-04-29 Robert Bragg + + * clutter/cogl/gles/cogl-texture.c: + Replaces an malloc call with g_malloc. + 2008-04-29 Robert Bragg * clutter/configure.ac: diff --git a/clutter/cogl/gles/cogl-texture.c b/clutter/cogl/gles/cogl-texture.c index 2eae2c9b7..a9b67a034 100644 --- a/clutter/cogl/gles/cogl-texture.c +++ b/clutter/cogl/gles/cogl-texture.c @@ -580,7 +580,7 @@ _cogl_texture_upload_subregion_to_gl (CoglTexture *tex, slice_bmp.width = inter_w; slice_bmp.height = inter_h; slice_bmp.rowstride = bpp * slice_bmp.width; - slice_bmp.data = (guchar*) malloc (slice_bmp.rowstride * + slice_bmp.data = (guchar*) g_malloc (slice_bmp.rowstride * slice_bmp.height); /* Copy subregion data */