diff options
| author | Corentin Chary <corentincj@iksaif.net> | 2010-05-19 09:24:06 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2010-06-01 12:53:09 -0500 |
| commit | 78c98c78705452e439f5b2ef5447ada23de9988e (patch) | |
| tree | e1c7e3209e85adc5affa33cb87a21cdb535a2451 | |
| parent | 9f643ec0f81c1836ce55319709dd387e27c55d3b (diff) | |
vnc: don't clear zlib stream on set_encoding
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 <corentincj@iksaif.net>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| -rw-r--r-- | vnc-encoding-zlib.c | 5 | ||||
| -rw-r--r-- | vnc.c | 1 | ||||
| -rw-r--r-- | vnc.h | 1 |
3 files changed, 0 insertions, 7 deletions
diff --git a/vnc-encoding-zlib.c b/vnc-encoding-zlib.c index 29dd1b7aee..52b18aa84a 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; -} @@ -1642,7 +1642,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; @@ -403,7 +403,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 */ |