diff options
Diffstat (limited to 'src/cairo-image-surface.c')
| -rw-r--r-- | src/cairo-image-surface.c | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/src/cairo-image-surface.c b/src/cairo-image-surface.c index b0a26bf9..0bec118f 100644 --- a/src/cairo-image-surface.c +++ b/src/cairo-image-surface.c @@ -334,7 +334,7 @@ _cairo_image_surface_create_with_masks (unsigned char *data, ASSERT_NOT_REACHED; } - return _cairo_image_surface_create_with_pixman_format (data, + return cairo_image_surface_create_with_pixman_format (data, pixman_format, width, height, @@ -364,11 +364,11 @@ _cairo_format_to_pixman_format_code (cairo_format_t format) } cairo_surface_t * -_cairo_image_surface_create_with_pixman_format (unsigned char *data, - pixman_format_code_t pixman_format, - int width, - int height, - int stride) +cairo_image_surface_create_with_pixman_format (unsigned char *data, + unsigned int pixman_format, + int width, + int height, + int stride) { cairo_surface_t *surface; pixman_image_t *pixman_image; @@ -428,7 +428,7 @@ cairo_image_surface_create (cairo_format_t format, pixman_format = _cairo_format_to_pixman_format_code (format); - return _cairo_image_surface_create_with_pixman_format (NULL, pixman_format, + return cairo_image_surface_create_with_pixman_format (NULL, pixman_format, width, height, -1); } slim_hidden_def (cairo_image_surface_create); @@ -562,10 +562,12 @@ cairo_image_surface_create_for_data (unsigned char *data, } pixman_format = _cairo_format_to_pixman_format_code (format); - return _cairo_image_surface_create_with_pixman_format (data, - pixman_format, - width, height, - stride); + + return cairo_image_surface_create_with_pixman_format (data, + pixman_format, + width, + height, + stride); } slim_hidden_def (cairo_image_surface_create_for_data); @@ -767,10 +769,10 @@ _cairo_image_surface_create_similar (void *abstract_other, cairo_image_surface_t *other = abstract_other; if (content == other->base.content) { - return _cairo_image_surface_create_with_pixman_format (NULL, - other->pixman_format, - width, height, - 0); + return cairo_image_surface_create_with_pixman_format (NULL, + other->pixman_format, + width, height, + 0); } return _cairo_image_surface_create_with_content (content, |