diff options
author | Robert Bragg <robert@linux.intel.com> | 2012-04-16 21:56:40 +0100 |
---|---|---|
committer | Robert Bragg <robert@linux.intel.com> | 2012-08-06 14:27:39 +0100 |
commit | 54735dec849a0f687d71288f458ab1050b7dd806 (patch) | |
tree | 2a856c2b482f121d25b6d9393ae81b79a64b669e /cogl/cogl-bitmap-private.h | |
parent | 09642a83b5f036756c7625ade7cf57358396baec (diff) | |
download | cogl-54735dec849a0f687d71288f458ab1050b7dd806.tar.gz |
Switch use of primitive glib types to c99 equivalents
The coding style has for a long time said to avoid using redundant glib
data types such as gint or gchar etc because we feel that they make the
code look unnecessarily foreign to developers coming from outside of the
Gnome developer community.
Note: When we tried to find the historical rationale for the types we
just found that they were apparently only added for consistent syntax
highlighting which didn't seem that compelling.
Up until now we have been continuing to use some of the platform
specific type such as gint{8,16,32,64} and gsize but this patch switches
us over to using the standard c99 equivalents instead so we can further
ensure that our code looks familiar to the widest range of C developers
who might potentially contribute to Cogl.
So instead of using the gint{8,16,32,64} and guint{8,16,32,64} types this
switches all Cogl code to instead use the int{8,16,32,64}_t and
uint{8,16,32,64}_t c99 types instead.
Instead of gsize we now use size_t
For now we are not going to use the c99 _Bool type and instead we have
introduced a new CoglBool type to use instead of gboolean.
Reviewed-by: Neil Roberts <neil@linux.intel.com>
(cherry picked from commit 5967dad2400d32ca6319cef6cb572e81bf2c15f0)
Diffstat (limited to 'cogl/cogl-bitmap-private.h')
-rw-r--r-- | cogl/cogl-bitmap-private.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/cogl/cogl-bitmap-private.h b/cogl/cogl-bitmap-private.h index b67c4f2e..c6b3cfc5 100644 --- a/cogl/cogl-bitmap-private.h +++ b/cogl/cogl-bitmap-private.h @@ -71,7 +71,7 @@ CoglBitmap * _cogl_bitmap_convert (CoglBitmap *bmp, CoglPixelFormat dst_format); -gboolean +CoglBool _cogl_bitmap_convert_into_bitmap (CoglBitmap *src_bmp, CoglBitmap *dst_bmp); @@ -79,17 +79,17 @@ CoglBitmap * _cogl_bitmap_from_file (const char *filename, GError **error); -gboolean +CoglBool _cogl_bitmap_unpremult (CoglBitmap *dst_bmp); -gboolean +CoglBool _cogl_bitmap_premult (CoglBitmap *dst_bmp); -gboolean +CoglBool _cogl_bitmap_convert_premult_status (CoglBitmap *bmp, CoglPixelFormat dst_format); -gboolean +CoglBool _cogl_bitmap_copy_subregion (CoglBitmap *src, CoglBitmap *dst, int src_x, @@ -103,7 +103,7 @@ _cogl_bitmap_copy_subregion (CoglBitmap *src, CoglBitmap * _cogl_bitmap_copy (CoglBitmap *src_bmp); -gboolean +CoglBool _cogl_bitmap_get_size_from_file (const char *filename, int *width, int *height); @@ -120,7 +120,7 @@ _cogl_bitmap_set_format (CoglBitmap *bitmap, uploads data using gdk_pixbuf_new_subpixbuf with a sub region containing the last row of the pixbuf because in that case the rowstride can be much larger than the width of the image */ -guint8 * +uint8_t * _cogl_bitmap_map (CoglBitmap *bitmap, CoglBufferAccess access, CoglBufferMapHint hints); @@ -134,7 +134,7 @@ _cogl_bitmap_unmap (CoglBitmap *bitmap); was created with new_from_buffer but it will however be good to pass to glTexImage2D for example. The access should be READ for unpacking and WRITE for packing. It can not be both */ -guint8 * +uint8_t * _cogl_bitmap_bind (CoglBitmap *bitmap, CoglBufferAccess access, CoglBufferMapHint hints); |