[Spice-devel] [spice-common] swcanvas: Remove canvas_create()

Jonathon Jongsma jjongsma at redhat.com
Tue Jul 3 21:58:25 UTC 2018


Looks like it was only ever called from the old client code that was
removed from the spice-server repository. 

Acked-by: Jonathon Jongsma <jjongsma at redhat.com>


On Tue, 2018-07-03 at 16:10 +0200, Christophe Fergeau wrote:
> Nothing calls it in spice-gtk or spice-server
> 
> Signed-off-by: Christophe Fergeau <cfergeau at redhat.com>
> ---
>  common/sw_canvas.c | 26 --------------------------
>  common/sw_canvas.h | 11 -----------
>  2 files changed, 37 deletions(-)
> 
> diff --git a/common/sw_canvas.c b/common/sw_canvas.c
> index c41edb1..c5528c2 100644
> --- a/common/sw_canvas.c
> +++ b/common/sw_canvas.c
> @@ -1222,32 +1222,6 @@ static SpiceCanvas
> *canvas_create_common(pixman_image_t *image,
>      return (SpiceCanvas *)canvas;
>  }
>  
> -SpiceCanvas *canvas_create(int width, int height, uint32_t format,
> -                           SpiceImageCache *bits_cache,
> -#ifdef SW_CANVAS_CACHE
> -                           SpicePaletteCache *palette_cache,
> -#endif
> -                           SpiceImageSurfaces *surfaces,
> -                           SpiceGlzDecoder *glz_decoder,
> -                           SpiceJpegDecoder *jpeg_decoder,
> -                           SpiceZlibDecoder *zlib_decoder)
> -{
> -    pixman_image_t *image;
> -
> -    image =
> pixman_image_create_bits(spice_surface_format_to_pixman(format),
> -                                     width, height, NULL, 0);
> -
> -    return canvas_create_common(image, format,
> -                                bits_cache,
> -#ifdef SW_CANVAS_CACHE
> -                                palette_cache,
> -#endif
> -                                surfaces,
> -                                glz_decoder,
> -                                jpeg_decoder,
> -                                zlib_decoder);
> -}
> -
>  SpiceCanvas *canvas_create_for_data(int width, int height, uint32_t
> format,
>                                      uint8_t *data, int stride,
>                                      SpiceImageCache *bits_cache,
> diff --git a/common/sw_canvas.h b/common/sw_canvas.h
> index aa9e46f..31f0644 100644
> --- a/common/sw_canvas.h
> +++ b/common/sw_canvas.h
> @@ -29,17 +29,6 @@
>  
>  SPICE_BEGIN_DECLS
>  
> -SpiceCanvas *canvas_create(int width, int height, uint32_t format
> -                           , SpiceImageCache *bits_cache
> -#ifdef SW_CANVAS_CACHE
> -                           , SpicePaletteCache *palette_cache
> -#endif
> -                           , SpiceImageSurfaces *surfaces
> -                           , SpiceGlzDecoder *glz_decoder
> -                           , SpiceJpegDecoder *jpeg_decoder
> -                           , SpiceZlibDecoder *zlib_decoder
> -                           );
> -
>  SpiceCanvas *canvas_create_for_data(int width, int height, uint32_t
> format, uint8_t *data, int stride
>                             , SpiceImageCache *bits_cache
>  #ifdef SW_CANVAS_CACHE


More information about the Spice-devel mailing list