summaryrefslogtreecommitdiffstats
path: root/common/canvas_base.c
diff options
context:
space:
mode:
authorAlexander Larsson <alexl@redhat.com>2010-02-18 20:42:58 +0100
committerAlexander Larsson <alexl@redhat.com>2010-02-23 22:52:06 +0100
commit7992266ccfb42d4b1242b6b78b80801f511d4b95 (patch)
tree6afaaeb714a39796e2b1eae746ac5390d486e946 /common/canvas_base.c
parentb5693ca0fc06bfe367770a63395ba01ec18ee3b2 (diff)
downloadspice-7992266ccfb42d4b1242b6b78b80801f511d4b95.tar.gz
spice-7992266ccfb42d4b1242b6b78b80801f511d4b95.tar.xz
spice-7992266ccfb42d4b1242b6b78b80801f511d4b95.zip
Remove cairo_t from cairo canvas
Diffstat (limited to 'common/canvas_base.c')
-rw-r--r--common/canvas_base.c41
1 files changed, 0 insertions, 41 deletions
diff --git a/common/canvas_base.c b/common/canvas_base.c
index 55404af1..8b2434bd 100644
--- a/common/canvas_base.c
+++ b/common/canvas_base.c
@@ -225,47 +225,6 @@ typedef struct ATTR_PACKED DataChunk {
#endif
-#ifdef CANVAS_USE_PIXMAN
-
-static pixman_format_code_t
-pixman_format_from_cairo_format (cairo_format_t format)
-{
- switch (format) {
- case CAIRO_FORMAT_A1:
- return PIXMAN_a1;
- case CAIRO_FORMAT_A8:
- return PIXMAN_a8;
- case CAIRO_FORMAT_RGB24:
- return PIXMAN_x8r8g8b8;
- case CAIRO_FORMAT_ARGB32:
- default:
- return PIXMAN_a8r8g8b8;
- }
-}
-
-static pixman_image_t *
-pixman_image_from_surface (cairo_surface_t *surface)
-{
- pixman_image_t *image;
- cairo_format_t format;
-
- format = cairo_image_surface_get_format (surface);
-
- image = (pixman_image_t *)cairo_surface_get_user_data(surface, &pixman_data_type);
-
- if (image)
- return pixman_image_ref (image);
-
- image = pixman_image_create_bits (pixman_format_from_cairo_format (format),
- cairo_image_surface_get_width (surface),
- cairo_image_surface_get_height (surface),
- (uint32_t *)cairo_image_surface_get_data (surface),
- cairo_image_surface_get_stride (surface));
-
- return image;
-}
-#endif
-
static inline void canvas_localize_palette(CanvasBase *canvas, SpicePalette *palette)
{
if (canvas->color_shift == 5) {