diff options
| author | Alexander Larsson <alexl@redhat.com> | 2010-04-19 16:19:43 +0200 |
|---|---|---|
| committer | Alexander Larsson <alexl@redhat.com> | 2010-04-23 16:36:35 +0200 |
| commit | 98d91203c5d2f6f7249f38941466857b6a566f5d (patch) | |
| tree | cdc2b54152f0be3d668ed49b903a35886fcc1c99 /common/cairo_canvas.h | |
| parent | 619c37af17406f77c7cb76f3b72bbfc268383d91 (diff) | |
| download | spice-98d91203c5d2f6f7249f38941466857b6a566f5d.tar.gz spice-98d91203c5d2f6f7249f38941466857b6a566f5d.tar.xz spice-98d91203c5d2f6f7249f38941466857b6a566f5d.zip | |
Make client canvas and pixmaps handle more formats and simplify
We now support 16bit format pixmaps as well as the old ones. Including
both 555 and 565 modes.
We drop the palette argument for pixmap construction as it was only
used for black/white anyway.
Canvas creation is simplified so that there is no separate set_mode
state. Canvases are already created in the right mode and never change.
Diffstat (limited to 'common/cairo_canvas.h')
| -rw-r--r-- | common/cairo_canvas.h | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/common/cairo_canvas.h b/common/cairo_canvas.h index 7f882b2a..c97380e2 100644 --- a/common/cairo_canvas.h +++ b/common/cairo_canvas.h @@ -26,7 +26,7 @@ #include "canvas_base.h" #include "region.h" -SpiceCanvas *canvas_create(pixman_image_t *image, int bits +SpiceCanvas *canvas_create(int width, int height, uint32_t format #ifdef CAIRO_CANVAS_CACHE , SpiceImageCache *bits_cache , SpicePaletteCache *palette_cache @@ -40,6 +40,21 @@ SpiceCanvas *canvas_create(pixman_image_t *image, int bits #endif ); +SpiceCanvas *canvas_create_for_data(int width, int height, uint32_t format, uint8_t *data, size_t stride +#ifdef CAIRO_CANVAS_CACHE + , SpiceImageCache *bits_cache + , SpicePaletteCache *palette_cache +#elif defined(CAIRO_CANVAS_IMAGE_CACHE) + , SpiceImageCache *bits_cache +#endif + , SpiceImageSurfaces *surfaces + , SpiceGlzDecoder *glz_decoder +#ifndef CAIRO_CANVAS_NO_CHUNKS + , SpiceVirtMapping *virt_mapping +#endif + ); + + void cairo_canvas_init(); #endif |