diff options
| author | Alexander Larsson <alexl@redhat.com> | 2010-02-08 15:38:24 +0100 |
|---|---|---|
| committer | Alexander Larsson <alexl@redhat.com> | 2010-02-23 14:43:20 +0100 |
| commit | 0b0342ee7ece8ea5a811cfb05c70f03ca4e3bde3 (patch) | |
| tree | 7e4ce72080519d7d55df6f3dadc63b6784c0856b /common/cairo_canvas.h | |
| parent | 7537acd630e8973c92bb769b56d78836372b30c2 (diff) | |
| download | spice-0b0342ee7ece8ea5a811cfb05c70f03ca4e3bde3.tar.gz spice-0b0342ee7ece8ea5a811cfb05c70f03ca4e3bde3.tar.xz spice-0b0342ee7ece8ea5a811cfb05c70f03ca4e3bde3.zip | |
Turn image and palette cache into c style dynamic interface
Instead of passing a bunch of function pointer and an opaque
pointer we make a real type and add a vtable pointer to it.
This means we can simplify all the canvas constructors, etc.
Diffstat (limited to 'common/cairo_canvas.h')
| -rw-r--r-- | common/cairo_canvas.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/common/cairo_canvas.h b/common/cairo_canvas.h index bf6ff907..b0c0820e 100644 --- a/common/cairo_canvas.h +++ b/common/cairo_canvas.h @@ -62,14 +62,12 @@ void canvas_set_access_params(CairoCanvas *canvas, unsigned long base, unsigned cairo_t *canvas_get_cairo(CairoCanvas *canvas); #ifdef CAIRO_CANVAS_CACHE -CairoCanvas *canvas_create(cairo_t *cairo, int bits, void *bits_cache_opaque, - bits_cache_put_fn_t bits_cache_put, bits_cache_get_fn_t bits_cache_get, - void *palette_cache_opaque, palette_cache_put_fn_t palette_cache_put, - palette_cache_get_fn_t palette_cache_get, - palette_cache_release_fn_t palette_cache_release +CairoCanvas *canvas_create(cairo_t *cairo, int bits, + SpiceImageCache *bits_cache, + SpicePaletteCache *palette_cache #elif defined(CAIRO_CANVAS_IMAGE_CACHE) -CairoCanvas *canvas_create(cairo_t *cairo, int bits, void *bits_cache_opaque, - bits_cache_put_fn_t bits_cache_put, bits_cache_get_fn_t bits_cache_get +CairoCanvas *canvas_create(cairo_t *cairo, int bits, + SpiceImageCache *bits_cache #else CairoCanvas *canvas_create(cairo_t *cairo, int bits #endif |