ok, ack On Wed, 2016-11-23 at 14:56 +0100, Victor Toso wrote: > From: Victor Toso <me@xxxxxxxxxxxxxx> > > Signed-off-by: Victor Toso <victortoso@xxxxxxxxxx> > --- > common/canvas_base.c | 24 ++++++++++-------------- > 1 file changed, 10 insertions(+), 14 deletions(-) > > diff --git a/common/canvas_base.c b/common/canvas_base.c > index da86002..89c7b43 100644 > --- a/common/canvas_base.c > +++ b/common/canvas_base.c > @@ -1123,6 +1123,16 @@ static pixman_image_t > *get_surface_from_canvas(CanvasBase *canvas, > case SPICE_IMAGE_TYPE_LZ_PLT: > case SPICE_IMAGE_TYPE_LZ_RGB: > return canvas_get_lz(canvas, image, want_original); > + > + case SPICE_IMAGE_TYPE_GLZ_RGB: > + return canvas_get_glz(canvas, image, want_original); > + > + case SPICE_IMAGE_TYPE_ZLIB_GLZ_RGB: > + return canvas_get_zlib_glz_rgb(canvas, image, > want_original); > + > + case SPICE_IMAGE_TYPE_FROM_CACHE_LOSSLESS: > + return canvas->bits_cache->ops->get_lossless(canvas- > >bits_cache, > + image- > >descriptor.id); > #endif > > case SPICE_IMAGE_TYPE_JPEG: > @@ -1139,24 +1149,10 @@ static pixman_image_t > *get_surface_from_canvas(CanvasBase *canvas, > return NULL; > #endif > > -#if defined(SW_CANVAS_CACHE) > - case SPICE_IMAGE_TYPE_GLZ_RGB: > - return canvas_get_glz(canvas, image, want_original); > - > - case SPICE_IMAGE_TYPE_ZLIB_GLZ_RGB: > - return canvas_get_zlib_glz_rgb(canvas, image, > want_original); > -#endif > - > case SPICE_IMAGE_TYPE_FROM_CACHE: > return canvas->bits_cache->ops->get(canvas->bits_cache, > image->descriptor.id); > > -#ifdef SW_CANVAS_CACHE > - case SPICE_IMAGE_TYPE_FROM_CACHE_LOSSLESS: > - return canvas->bits_cache->ops->get_lossless(canvas- > >bits_cache, > - image- > >descriptor.id); > -#endif > - > case SPICE_IMAGE_TYPE_BITMAP: > return canvas_get_bits(canvas, &image->u.bitmap, > want_original); > _______________________________________________ Spice-devel mailing list Spice-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/spice-devel