isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-25 04:22:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

texture: It's bytes per pixel, not bits

Browse Source 
Clarify the error message when checking the bpp argument.
This commit is contained in:
Emmanuele Bassi 2012-01-31 10:23:48 +00:00
parent 986307f5e4
commit c95b126571
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
clutter/clutter-texture.c
View File

@ -1573,7 +1573,7 @@ get_pixel_format_from_texture_flags (gint bpp,
{ {
if (G_UNLIKELY (bpp != 4)) if (G_UNLIKELY (bpp != 4))
{ {
g_warning ("Unsupported bits per pixel value '%d': " g_warning ("Unsupported bytes per pixel value '%d': "
"Clutter supports only a value of 4 " "Clutter supports only a value of 4 "
"for RGBA data", "for RGBA data",
bpp); bpp);
@ -1586,7 +1586,7 @@ get_pixel_format_from_texture_flags (gint bpp,
{ {
if (G_UNLIKELY (bpp != 3)) if (G_UNLIKELY (bpp != 3))
{ {
g_warning ("Unsupported bits per pixel value '%d': " g_warning ("Unsupported bytes per pixel value '%d': "
"Clutter supports only a BPP value of 3 " "Clutter supports only a BPP value of 3 "
"for RGB data", "for RGB data",
bpp); bpp);
@ -1607,14 +1607,14 @@ get_pixel_format_from_texture_flags (gint bpp,
/** /**
* clutter_texture_set_from_rgb_data: * clutter_texture_set_from_rgb_data:
* @texture: A #ClutterTexture * @texture: a #ClutterTexture
* @data: (array): Image data in RGBA type colorspace. * @data: (array): image data in RGBA type colorspace.
* @has_alpha: Set to TRUE if image data has an alpha channel. * @has_alpha: set to %TRUE if image data has an alpha channel.
* @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 3 and 4 supported, * @bpp: bytes per pixel (currently only 3 and 4 supported, depending
* depending on @has_alpha) * on the value of @has_alpha)
* @flags: #ClutterTextureFlags * @flags: #ClutterTextureFlags
* @error: return location for a #GError, or %NULL. * @error: return location for a #GError, or %NULL.
* *