diff options
| author | Christophe Fergeau <cfergeau@redhat.com> | 2015-01-23 17:17:58 +0100 |
|---|---|---|
| committer | Christophe Fergeau <cfergeau@redhat.com> | 2015-03-26 10:15:04 +0100 |
| commit | edac1b36b572cbd8988c44341185a9f51ea3eeb5 (patch) | |
| tree | c57aa56620e1ace3ec5eaa44a3e8412c6d70da46 /common/gdi_canvas.c | |
| parent | d2ee99e15f773306647696d45d69bfc5e358cd29 (diff) | |
| download | spice-common-edac1b36b572cbd8988c44341185a9f51ea3eeb5.tar.gz spice-common-edac1b36b572cbd8988c44341185a9f51ea3eeb5.tar.xz spice-common-edac1b36b572cbd8988c44341185a9f51ea3eeb5.zip | |
Get rid of SW_CANVAS_IMAGE_CACHE
Every time it's used, it's in constructs similar to:
#ifdef SW_CANVAS_CACHE
, SpiceImageCache *bits_cache
, SpicePaletteCache *palette_cache
#elif defined(SW_CANVAS_IMAGE_CACHE)
, SpiceImageCache *bits_cache
#endif
This can be rewritten as:
, SpiceImageCache *bits_cache
#ifdef SW_CANVAS_CACHE
, SpicePaletteCache *palette_cache
#endif
allowing to get rid of SW_CANVAS_IMAGE_CACHE.
Diffstat (limited to 'common/gdi_canvas.c')
| -rw-r--r-- | common/gdi_canvas.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/common/gdi_canvas.c b/common/gdi_canvas.c index 3042031..3c434d6 100644 --- a/common/gdi_canvas.c +++ b/common/gdi_canvas.c @@ -1802,11 +1802,9 @@ static SpiceCanvasOps gdi_canvas_ops; SpiceCanvas *gdi_canvas_create(int width, int height, HDC dc, RecurciveMutex* lock, uint32_t format -#ifdef SW_CANVAS_CACHE , SpiceImageCache *bits_cache +#ifdef SW_CANVAS_CACHE , SpicePaletteCache *palette_cache -#elif defined(SW_CANVAS_IMAGE_CACHE) - , SpiceImageCache *bits_cache #endif , SpiceImageSurfaces *surfaces , SpiceGlzDecoder *glz_decoder @@ -1822,11 +1820,9 @@ SpiceCanvas *gdi_canvas_create(int width, int height, canvas = spice_new0(GdiCanvas, 1); canvas_base_init(&canvas->base, &gdi_canvas_ops, width, height, format, -#ifdef SW_CANVAS_CACHE bits_cache, +#ifdef SW_CANVAS_CACHE palette_cache, -#elif defined(SW_CANVAS_IMAGE_CACHE) - bits_cache, #endif surfaces, glz_decoder, |