2008-04-29 Robert Bragg <bob@o-hand.com>

	* clutter/cogl/gles/cogl-texture.c:
	Replaces an malloc call with g_malloc.

diff --git a/ChangeLog b/ChangeLog
index ed6b8c3..15f34f8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2008-04-29  Robert Bragg  <bob@o-hand.com>
        
+       * clutter/cogl/gles/cogl-texture.c:
+       Replaces an malloc call with g_malloc.
+
+2008-04-29  Robert Bragg  <bob@o-hand.com>
+       
        * clutter/configure.ac:
        When looking for a GLES 1 library, also try the name "GLESv1_CM".
 

diff --git a/clutter/cogl/gles/cogl-texture.c b/clutter/cogl/gles/cogl-texture.c
index 2eae2c9..a9b67a0 100644 (file)
--- 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 */