[Spice-commits] common/canvas_base.c

[Pavel Grunt]

 common/canvas_base.c |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 739a859d79428fe188cd6516508ba013a162a810
Author: Pavel Grunt <pgrunt at redhat.com>
Date:   Tue Apr 19 12:35:22 2016 +0200

    Define canvas_fix_alignment when is used
    
    It is used in canvas_get_lz4() which is guarded by USE_LZ4, and
    in canvas_get_lz() which is guarded by SW_CANVAS_CACHE.
    Acked-by: Christophe Fergeau <cfergeau at redhat.com>

diff --git a/common/canvas_base.c b/common/canvas_base.c
index 45dd75f..114c1b9 100644
--- a/common/canvas_base.c
+++ b/common/canvas_base.c
@@ -515,6 +515,7 @@ static pixman_image_t *canvas_get_jpeg(CanvasBase *canvas, SpiceImage *image)
     return surface;
 }
 
+#if defined(USE_LZ4) || defined(SW_CANVAS_CACHE)
 static void canvas_fix_alignment(uint8_t *bits,
                                  int stride_encoded, int stride_pixman,
                                  int height)
@@ -531,6 +532,7 @@ static void canvas_fix_alignment(uint8_t *bits,
         }
     }
 }
+#endif
 
 #ifdef USE_LZ4
 static pixman_image_t *canvas_get_lz4(CanvasBase *canvas, SpiceImage *image)