isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-26 10:00:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix a warning in the vtable for texture_2d_get_data

Browse Source 
The function pointer for texture_2d_get_data in the driver vtable was
expecting an unsigned int for the rowstride but the definition in
cogl-texture-2d-gl.c took a size_t so it was giving an annoying
warning. This normalizes them both to just take an int. This seems to
better match the pattern used for cogl_bitmap_new_from_data and
cogl_texture_2d_new_from_data.

Reviewed-by: Robert Bragg <robert@linux.intel.com>

(cherry picked from commit 003f080531d5368835081568779b031ef4f09a77)
This commit is contained in:
Neil Roberts 2012-09-26 17:05:01 +01:00 committed by Robert Bragg
parent 8f3380adc3
commit 2bcf38d126
8 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cogl/cogl-driver.h
View File

@ -209,7 +209,7 @@ struct _CoglDriverVtable
void void
(* texture_2d_get_data) (CoglTexture2D *tex_2d, (* texture_2d_get_data) (CoglTexture2D *tex_2d,
CoglPixelFormat format, CoglPixelFormat format,
unsigned int rowstride, int rowstride,
uint8_t *data); uint8_t *data);
/* Prepares for drawing by flushing the journal, framebuffer state, /* Prepares for drawing by flushing the journal, framebuffer state,

2
cogl/cogl-texture-2d.c
View File

@ -505,7 +505,7 @@ _cogl_texture_2d_set_region (CoglTexture *tex,
static CoglBool static CoglBool
_cogl_texture_2d_get_data (CoglTexture *tex, _cogl_texture_2d_get_data (CoglTexture *tex,
CoglPixelFormat format, CoglPixelFormat format,
unsigned int rowstride, int rowstride,
uint8_t *data) uint8_t *data)
{ {
CoglContext *ctx = tex->context; CoglContext *ctx = tex->context;

2
cogl/cogl-texture-3d.c
View File

@ -572,7 +572,7 @@ _cogl_texture_3d_set_region (CoglTexture *tex,
static int static int
_cogl_texture_3d_get_data (CoglTexture *tex, _cogl_texture_3d_get_data (CoglTexture *tex,
CoglPixelFormat format, CoglPixelFormat format,
unsigned int rowstride, int rowstride,
uint8_t *data) uint8_t *data)
{ {
/* FIXME: we could probably implement this by assuming the data is /* FIXME: we could probably implement this by assuming the data is

2
cogl/cogl-texture-private.h
View File

@ -81,7 +81,7 @@ struct _CoglTextureVtable
be necessary). */ be necessary). */
CoglBool (* get_data) (CoglTexture *tex, CoglBool (* get_data) (CoglTexture *tex,
CoglPixelFormat format, CoglPixelFormat format,
unsigned int rowstride, int rowstride,
uint8_t *data); uint8_t *data);
void (* foreach_sub_texture_in_region) (CoglTexture *tex, void (* foreach_sub_texture_in_region) (CoglTexture *tex,

2
cogl/cogl-texture-rectangle.c
View File

@ -568,7 +568,7 @@ _cogl_texture_rectangle_set_region (CoglTexture *tex,
static CoglBool static CoglBool
_cogl_texture_rectangle_get_data (CoglTexture *tex, _cogl_texture_rectangle_get_data (CoglTexture *tex,
CoglPixelFormat format, CoglPixelFormat format,
unsigned int rowstride, int rowstride,
uint8_t *data) uint8_t *data)
{ {
CoglTextureRectangle *tex_rect = COGL_TEXTURE_RECTANGLE (tex); CoglTextureRectangle *tex_rect = COGL_TEXTURE_RECTANGLE (tex);

2
cogl/driver/gl/cogl-texture-2d-gl-private.h
View File

@ -106,7 +106,7 @@ _cogl_texture_2d_gl_copy_from_bitmap (CoglTexture2D *tex_2d,
void void
_cogl_texture_2d_gl_get_data (CoglTexture2D *tex_2d, _cogl_texture_2d_gl_get_data (CoglTexture2D *tex_2d,
CoglPixelFormat format, CoglPixelFormat format,
size_t rowstride, int rowstride,
uint8_t *data); uint8_t *data);
#endif /* _COGL_TEXTURE_2D_GL_PRIVATE_H_ */ #endif /* _COGL_TEXTURE_2D_GL_PRIVATE_H_ */

2
cogl/driver/gl/cogl-texture-2d-gl.c
View File

@ -542,7 +542,7 @@ _cogl_texture_2d_gl_copy_from_bitmap (CoglTexture2D *tex_2d,
void void
_cogl_texture_2d_gl_get_data (CoglTexture2D *tex_2d, _cogl_texture_2d_gl_get_data (CoglTexture2D *tex_2d,
CoglPixelFormat format, CoglPixelFormat format,
size_t rowstride, int rowstride,
uint8_t *data) uint8_t *data)
{ {
CoglContext *ctx = COGL_TEXTURE (tex_2d)->context; CoglContext *ctx = COGL_TEXTURE (tex_2d)->context;

2
cogl/winsys/cogl-texture-pixmap-x11.c
View File

@ -694,7 +694,7 @@ _cogl_texture_pixmap_x11_set_region (CoglTexture *tex,
static CoglBool static CoglBool
_cogl_texture_pixmap_x11_get_data (CoglTexture *tex, _cogl_texture_pixmap_x11_get_data (CoglTexture *tex,
CoglPixelFormat format, CoglPixelFormat format,
unsigned int rowstride, int rowstride,
uint8_t *data) uint8_t *data)
{ {
CoglTexturePixmapX11 *tex_pixmap = COGL_TEXTURE_PIXMAP_X11 (tex); CoglTexturePixmapX11 *tex_pixmap = COGL_TEXTURE_PIXMAP_X11 (tex);