brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2008-02-12 Matthew Allum <mallum@openedhand.com>

Browse Source 
* clutter/clutter-texture.c: (texture_get_tile_pixbuf):
        ifdef out 'leaked' GL only API call.
This commit is contained in:
Matthew Allum 2008-02-12 15:17:28 +00:00
parent 14de7190d2
commit 9c625d187d
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2008-02-12 Matthew Allum <mallum@openedhand.com>
* clutter/clutter-texture.c: (texture_get_tile_pixbuf):
ifdef out 'leaked' GL only API call.
2008-02-12 Tomas Frydrych <tf@openedhand.com> 2008-02-12 Tomas Frydrych <tf@openedhand.com>
* clutter/clutter-texture.c (texture_update_data): * clutter/clutter-texture.c (texture_update_data):

4
clutter/clutter-texture.c
View File

@ -1194,6 +1194,7 @@ texture_get_tile_pixbuf (ClutterTexture *texture,
COGLuint texture_id, COGLuint texture_id,
gint bpp) gint bpp)
{ {
#ifndef HAVE_COGL_GL
ClutterTexturePrivate *priv; ClutterTexturePrivate *priv;
guchar *pixels = NULL; guchar *pixels = NULL;
guint tex_width, tex_height; guint tex_width, tex_height;
@ -1236,6 +1237,9 @@ texture_get_tile_pixbuf (ClutterTexture *texture,
((tex_width * bpp + 3) &~ 3), ((tex_width * bpp + 3) &~ 3),
pixbuf_destroy_notify, pixbuf_destroy_notify,
NULL); NULL);
#else
return NULL;
#endif
} }
/** /**