[Spice-devel] [spice-common v1 2/4] canvas-base: group ifdef and defined together

[Victor Toso]

From: Victor Toso <me at victortoso.com>

Signed-off-by: Victor Toso <victortoso at redhat.com>
---
 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);
 
-- 
2.9.3