From 00f77ed8404201ed61ceaf917c80f3a1b598b807 Mon Sep 17 00:00:00 2001 From: Chris Lord Date: Tue, 1 Jul 2008 10:11:39 +0000 Subject: [PATCH] * clutter/clutter-texture.c: Correct documentation about accepted pixel formats * tests/test-stage-read-pixels.c: (main): Don't try to free a ClutterTexture after main, fixes segfault on quit --- ChangeLog | 8 ++++++++ clutter/clutter-texture.c | 6 ++++-- tests/test-stage-read-pixels.c | 1 - 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index e7b43f994..ee321ade8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-07-01 Chris Lord + + * clutter/clutter-texture.c: + Correct documentation about accepted pixel formats + + * tests/test-stage-read-pixels.c: (main): + Don't try to free a ClutterTexture after main, fixes segfault on quit + 2008-07-01 Emmanuele Bassi * clutter/clutter-behaviour-bspline.h: diff --git a/clutter/clutter-texture.c b/clutter/clutter-texture.c index 1220fc5aa..a84e170cb 100644 --- a/clutter/clutter-texture.c +++ b/clutter/clutter-texture.c @@ -1072,7 +1072,8 @@ clutter_texture_set_from_data (ClutterTexture *texture, * @width: Width in pixels of image data. * @height: Height in pixels of image data * @rowstride: Distance in bytes between row starts. - * @bpp: bytes per pixel ( Currently only 4 supported ) + * @bpp: bytes per pixel (Currently only 3 and 4 supported, + * depending on @has_alpha) * @flags: #ClutterTextureFlags * @error: return location for a #GError, or %NULL. * @@ -1476,7 +1477,8 @@ clutter_texture_get_base_size (ClutterTexture *texture, * @width: Width in pixels of region to update. * @height: Height in pixels of region to update. * @rowstride: Distance in bytes between row starts on source buffer. - * @bpp: bytes per pixel ( Currently only 4 supported ) + * @bpp: bytes per pixel (Currently only 3 and 4 supported, + * depending on @has_alpha) * @flags: #ClutterTextureFlags * @error: return location for a #GError, or %NULL * diff --git a/tests/test-stage-read-pixels.c b/tests/test-stage-read-pixels.c index 81a36575b..70e263874 100644 --- a/tests/test-stage-read-pixels.c +++ b/tests/test-stage-read-pixels.c @@ -274,7 +274,6 @@ main (int argc, char *argv[]) clutter_main (); - g_free (oh->tv); g_free (oh->hand); g_free (oh);