From patchwork Wed May 19 07:24:06 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [v3,06/12] vnc: don't clear zlib stream on set_encoding Date: Tue, 18 May 2010 21:24:06 -0000 From: Corentin Chary X-Patchwork-Id: 52961 Message-Id: <1274253852-16068-7-git-send-email-corentincj@iksaif.net> To: qemu-devel@nongnu.org Cc: Corentin Chary , Anthony Liguori , Alexander Graf , Adam Litke On init, values are already NULL, but we shouldn't try to reset them each time a client send a set encoding command because this break everything. For example, libvncclient re-send a set encoding command if the framebuffer is resized. This fix framebuffer resizing for zlib encoding. Signed-off-by: Corentin Chary --- vnc-encoding-zlib.c | 5 ----- vnc.c | 1 - vnc.h | 1 - 3 files changed, 0 insertions(+), 7 deletions(-) diff --git a/vnc-encoding-zlib.c b/vnc-encoding-zlib.c index 29dd1b7..52b18aa 100644 --- a/vnc-encoding-zlib.c +++ b/vnc-encoding-zlib.c @@ -140,8 +140,3 @@ void vnc_zlib_send_framebuffer_update(VncState *vs, int x, int y, int w, int h) vnc_write_u32(vs, bytes_written); vs->output.offset = new_offset; } - -void vnc_zlib_init(VncState *vs) -{ - vs->zlib_stream.opaque = NULL; -} diff --git a/vnc.c b/vnc.c index e81a2a5..a5a0456 100644 --- a/vnc.c +++ b/vnc.c @@ -1592,7 +1592,6 @@ static void set_encodings(VncState *vs, int32_t *encodings, size_t n_encodings) int i; unsigned int enc = 0; - vnc_zlib_init(vs); vs->features = 0; vs->vnc_encoding = 0; vs->tight_compression = 9; diff --git a/vnc.h b/vnc.h index 96f3fe7..b2d8738 100644 --- a/vnc.h +++ b/vnc.h @@ -397,7 +397,6 @@ void vnc_hextile_send_framebuffer_update(VncState *vs, int x, int y, int w, int h); void vnc_hextile_set_pixel_conversion(VncState *vs, int generic); -void vnc_zlib_init(VncState *vs); void vnc_zlib_send_framebuffer_update(VncState *vs, int x, int y, int w, int h); #endif /* __QEMU_VNC_H */