summaryrefslogtreecommitdiffstats
path: root/common/cairo_canvas.h
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/cairo_canvas.h
parentb5693ca0fc06bfe367770a63395ba01ec18ee3b2 (diff)
downloadspice-7992266ccfb42d4b1242b6b78b80801f511d4b95.tar.gz
spice-7992266ccfb42d4b1242b6b78b80801f511d4b95.tar.xz
spice-7992266ccfb42d4b1242b6b78b80801f511d4b95.zip
Remove cairo_t from cairo canvas
Diffstat (limited to 'common/cairo_canvas.h')
-rw-r--r--common/cairo_canvas.h10
1 files changed, 4 insertions, 6 deletions
diff --git a/common/cairo_canvas.h b/common/cairo_canvas.h
index 2b935098..205c62cb 100644
--- a/common/cairo_canvas.h
+++ b/common/cairo_canvas.h
@@ -22,7 +22,7 @@
#include <stdint.h>
#include <spice/draw.h>
-#include "cairo.h"
+#include "pixman_utils.h"
#include "canvas_base.h"
#include "region.h"
@@ -59,17 +59,15 @@ void canvas_set_addr_delta(CairoCanvas *canvas, SPICE_ADDRESS delta);
void canvas_set_access_params(CairoCanvas *canvas, unsigned long base, unsigned long max);
#endif
-cairo_t *canvas_get_cairo(CairoCanvas *canvas);
-
#ifdef CAIRO_CANVAS_CACHE
-CairoCanvas *canvas_create(cairo_t *cairo, int bits,
+CairoCanvas *canvas_create(pixman_image_t *image, int bits,
SpiceImageCache *bits_cache,
SpicePaletteCache *palette_cache
#elif defined(CAIRO_CANVAS_IMAGE_CACHE)
-CairoCanvas *canvas_create(cairo_t *cairo, int bits,
+CairoCanvas *canvas_create(pixman_image_t *image, int bits,
SpiceImageCache *bits_cache
#else
-CairoCanvas *canvas_create(cairo_t *cairo, int bits
+CairoCanvas *canvas_create(pixman_image_t *image, int bits
#endif
#ifdef USE_GLZ
, void *glz_decoder_opaque, glz_decode_fn_t glz_decode