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

* clutter/clutter-texture.c:

Browse Source 
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
This commit is contained in:
Chris Lord 2008-07-01 10:11:39 +00:00
parent 07f68e61f8
commit 00f77ed840
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2008-07-01 Chris Lord <chris@openedhand.com>
* 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 <ebassi@openedhand.com> 2008-07-01 Emmanuele Bassi <ebassi@openedhand.com>
* clutter/clutter-behaviour-bspline.h: * clutter/clutter-behaviour-bspline.h:

6
clutter/clutter-texture.c
View File

@ -1072,7 +1072,8 @@ clutter_texture_set_from_data (ClutterTexture *texture,
* @width: Width in pixels of image data. * @width: Width in pixels of image data.
* @height: Height in pixels of image data * @height: Height in pixels of image data
* @rowstride: Distance in bytes between row starts. * @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 * @flags: #ClutterTextureFlags
* @error: return location for a #GError, or %NULL. * @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. * @width: Width in pixels of region to update.
* @height: Height in pixels of region to update. * @height: Height in pixels of region to update.
* @rowstride: Distance in bytes between row starts on source buffer. * @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 * @flags: #ClutterTextureFlags
* @error: return location for a #GError, or %NULL * @error: return location for a #GError, or %NULL
* *

1
tests/test-stage-read-pixels.c
View File

@ -274,7 +274,6 @@ main (int argc, char *argv[])
clutter_main (); clutter_main ();
g_free (oh->tv);
g_free (oh->hand); g_free (oh->hand);
g_free (oh); g_free (oh);