diff options
Diffstat (limited to 'gfx/cairo/cairo/src/cairo-image-surface.c')
| -rw-r--r-- | gfx/cairo/cairo/src/cairo-image-surface.c | 43 |
1 files changed, 29 insertions, 14 deletions
diff --git a/gfx/cairo/cairo/src/cairo-image-surface.c b/gfx/cairo/cairo/src/cairo-image-surface.c index 3b11eb9815..fe64cd76c1 100644 --- a/gfx/cairo/cairo/src/cairo-image-surface.c +++ b/gfx/cairo/cairo/src/cairo-image-surface.c @@ -248,6 +248,27 @@ _pixman_format_from_masks (cairo_format_masks_t *masks, return TRUE; } +#if PIXMAN_VERSION >= PIXMAN_VERSION_ENCODE(0,39,0) +/* Convenience function to convert #cairo_dither_t into #pixman_dither_t */ +static pixman_dither_t +_cairo_dither_to_pixman_dither (cairo_dither_t dither) +{ + switch (dither) { + case CAIRO_DITHER_FAST: + return PIXMAN_DITHER_FAST; + case CAIRO_DITHER_GOOD: + return PIXMAN_DITHER_GOOD; + case CAIRO_DITHER_BEST: + return PIXMAN_DITHER_BEST; + case CAIRO_DITHER_NONE: + case CAIRO_DITHER_DEFAULT: + default: + return PIXMAN_DITHER_NONE; + } +} +#endif + + /* A mask consisting of N bits set to 1. */ #define MASK(N) ((1UL << (N))-1) @@ -411,9 +432,8 @@ cairo_image_surface_create (cairo_format_t format, return _cairo_image_surface_create_with_pixman_format (NULL, pixman_format, width, height, -1); } -slim_hidden_def (cairo_image_surface_create); - cairo_surface_t * +cairo_surface_t * _cairo_image_surface_create_with_content (cairo_content_t content, int width, int height) @@ -449,7 +469,7 @@ _cairo_image_surface_create_with_content (cairo_content_t content, * * Since: 1.6 **/ - int +int cairo_format_stride_for_width (cairo_format_t format, int width) { @@ -466,7 +486,6 @@ cairo_format_stride_for_width (cairo_format_t format, return CAIRO_STRIDE_FOR_WIDTH_BPP (width, bpp); } -slim_hidden_def (cairo_format_stride_for_width); /** * cairo_image_surface_create_for_data: @@ -513,7 +532,7 @@ slim_hidden_def (cairo_format_stride_for_width); * * Since: 1.0 **/ - cairo_surface_t * +cairo_surface_t * cairo_image_surface_create_for_data (unsigned char *data, cairo_format_t format, int width, @@ -549,7 +568,6 @@ cairo_image_surface_create_for_data (unsigned char *data, width, height, stride); } -slim_hidden_def (cairo_image_surface_create_for_data); /** * cairo_image_surface_get_data: @@ -581,7 +599,6 @@ cairo_image_surface_get_data (cairo_surface_t *surface) return image_surface->data; } -slim_hidden_def (cairo_image_surface_get_data); /** * cairo_image_surface_get_format: @@ -605,7 +622,6 @@ cairo_image_surface_get_format (cairo_surface_t *surface) return image_surface->format; } -slim_hidden_def (cairo_image_surface_get_format); /** * cairo_image_surface_get_width: @@ -629,7 +645,6 @@ cairo_image_surface_get_width (cairo_surface_t *surface) return image_surface->width; } -slim_hidden_def (cairo_image_surface_get_width); /** * cairo_image_surface_get_height: @@ -653,7 +668,6 @@ cairo_image_surface_get_height (cairo_surface_t *surface) return image_surface->height; } -slim_hidden_def (cairo_image_surface_get_height); /** * cairo_image_surface_get_stride: @@ -681,9 +695,8 @@ cairo_image_surface_get_stride (cairo_surface_t *surface) return image_surface->stride; } -slim_hidden_def (cairo_image_surface_get_stride); - cairo_format_t +cairo_format_t _cairo_format_from_content (cairo_content_t content) { switch (content) { @@ -699,7 +712,7 @@ _cairo_format_from_content (cairo_content_t content) return CAIRO_FORMAT_INVALID; } - cairo_content_t +cairo_content_t _cairo_content_from_format (cairo_format_t format) { switch (format) { @@ -724,7 +737,7 @@ _cairo_content_from_format (cairo_format_t format) return CAIRO_CONTENT_COLOR_ALPHA; } - int +int _cairo_format_bits_per_pixel (cairo_format_t format) { switch (format) { @@ -938,6 +951,8 @@ _cairo_image_surface_paint (void *abstract_surface, const cairo_clip_t *clip) { cairo_image_surface_t *surface = abstract_surface; + pixman_dither_t pixman_dither = _cairo_dither_to_pixman_dither (source->dither); + pixman_image_set_dither (surface->pixman_image, pixman_dither); TRACE ((stderr, "%s (surface=%d)\n", __FUNCTION__, surface->base.unique_id)); |