[Spice-commits] spice-common src/channel-display.c

[Frediano Ziglio]

 spice-common          |    2 +-
 src/channel-display.c |    3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 090fbac32291154efe4e4c19a23543ecb68af74e
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Thu Jan 18 14:53:43 2018 +0000

    GDI canvas cleanup
    
    GDI canvas support was removed from spice-common as not even
    compiling for a long time.
    This requires some changed to spice-gtk too.
    
    Frediano Ziglio (14):
          canvas: Simplify code using spice_memdup
          canvas: Remove possible leak on LZ decompression failure
          lz: Avoid temporary variable
          lz: Simplify code
          lz: Remove unused encode_level and only assigned io_start
          canvas: Move PixmanData to C file
          canvas: Remove mutex field from PixmanData
          canvas: Remove Windows bitmap allocation
          canvas: Remove unused dc parameter from surface_create
          canvas: Remove dc parameter from SwCanvas::put_image
          canvas: Remove dc fields from CanvasBase and LzDecodeUsrData
          canvas: Unify __surface_create_stride and surface_create_stride
          canvas: Remove unused include header
          canvas: Prevent some error compiling spice-gtk
    
    Pavel Grunt (1):
          Remove GDI canvas
    
    Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
    Acked-by: Snir Sheriber <ssheribe at redhat.com>

diff --git a/spice-common b/spice-common
index 122be3d..f3478aa 160000
--- a/spice-common
+++ b/spice-common
@@ -1 +1 @@
-Subproject commit 122be3d1f75b2f83555acb712e5c5420c9b1d6a7
+Subproject commit f3478aa4b6a5aa1c7ef01cc976790ee2ee9feaec
diff --git a/src/channel-display.c b/src/channel-display.c
index 2208693..84ad4af 100644
--- a/src/channel-display.c
+++ b/src/channel-display.c
@@ -1394,9 +1394,6 @@ void stream_display_frame(display_stream *st, SpiceFrame *frame,
     }
 
     st->surface->canvas->ops->put_image(st->surface->canvas,
-#ifdef G_OS_WIN32
-                                        SPICE_DISPLAY_CHANNEL(st->channel)->priv->dc,
-#endif
                                         &frame->dest, data,
                                         width, height, stride,
                                         st->have_region ? &st->region : NULL);