From 9c625d187dadc924e05ca42f81e22cd21dcd3731 Mon Sep 17 00:00:00 2001 From: Matthew Allum Date: Tue, 12 Feb 2008 15:17:28 +0000 Subject: [PATCH] 2008-02-12 Matthew Allum * clutter/clutter-texture.c: (texture_get_tile_pixbuf): ifdef out 'leaked' GL only API call. --- ChangeLog | 5 +++++ clutter/clutter-texture.c | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/ChangeLog b/ChangeLog index 264983203..fb9fc0bde 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-02-12 Matthew Allum + + * clutter/clutter-texture.c: (texture_get_tile_pixbuf): + ifdef out 'leaked' GL only API call. + 2008-02-12 Tomas Frydrych * clutter/clutter-texture.c (texture_update_data): diff --git a/clutter/clutter-texture.c b/clutter/clutter-texture.c index 307944824..1c94e43c7 100644 --- a/clutter/clutter-texture.c +++ b/clutter/clutter-texture.c @@ -1194,6 +1194,7 @@ texture_get_tile_pixbuf (ClutterTexture *texture, COGLuint texture_id, gint bpp) { +#ifndef HAVE_COGL_GL ClutterTexturePrivate *priv; guchar *pixels = NULL; guint tex_width, tex_height; @@ -1236,6 +1237,9 @@ texture_get_tile_pixbuf (ClutterTexture *texture, ((tex_width * bpp + 3) &~ 3), pixbuf_destroy_notify, NULL); +#else + return NULL; +#endif } /**