[Spice-devel] [spice-gtk] GDI canvas cleanup

Frediano Ziglio fziglio at redhat.com
Thu Jan 18 14:53:54 UTC 2018


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>
---
 spice-common          | 2 +-
 src/channel-display.c | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/spice-common b/spice-common
index 637621a..f06de87 160000
--- a/spice-common
+++ b/spice-common
@@ -1 +1 @@
-Subproject commit 637621a9b99d2159b83272154b9d725cb7754e04
+Subproject commit f06de87cf465a22f33dc6b926fbff1aadc1e48a3
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);
-- 
2.14.3



More information about the Spice-devel mailing list