aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Martin <github@martintribe.org>2012-05-16 12:54:25 +0000
committerStefan Hajnoczi <stefanha@redhat.com>2012-10-19 10:27:37 +0200
commitfe3e7f2dc05225cdd2ba40defcd4e2581bebc5e0 (patch)
tree9ca047938dc731533f3ba598d4dea24f0338fa8e
parentb6348f29d033d5a8a26f633d2ee94362595f32a4 (diff)
downloadqemu-fe3e7f2dc05225cdd2ba40defcd4e2581bebc5e0.zip
qemu-fe3e7f2dc05225cdd2ba40defcd4e2581bebc5e0.tar.gz
qemu-fe3e7f2dc05225cdd2ba40defcd4e2581bebc5e0.tar.bz2
ui/vnc: Only report/use TIGHT_PNG encoding if enabled.
If TIGHT_PNG is not enabled by the --enable-vnc-png configure flag then do not report to the client that it is supported. Also, since TIGHT_PNG is the same as the TIGHT encoding but with the filter/copy replaced with PNG data, adding it to the supported encodings list when it is disabled will cause the TIGHT encoding to be used even though the client requested TIGHT_PNG. Signed-off-by: Joel Martin <github@martintribe.org> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
-rw-r--r--ui/vnc.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/ui/vnc.c b/ui/vnc.c
index 33e6386..66ae930 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -1806,10 +1806,12 @@ static void set_encodings(VncState *vs, int32_t *encodings, size_t n_encodings)
vs->features |= VNC_FEATURE_TIGHT_MASK;
vs->vnc_encoding = enc;
break;
+#ifdef CONFIG_VNC_PNG
case VNC_ENCODING_TIGHT_PNG:
vs->features |= VNC_FEATURE_TIGHT_PNG_MASK;
vs->vnc_encoding = enc;
break;
+#endif
case VNC_ENCODING_ZLIB:
vs->features |= VNC_FEATURE_ZLIB_MASK;
vs->vnc_encoding = enc;