[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] Fix build errors introduced by vnc jpeg changes
From: |
David Gibson |
Subject: |
[Qemu-devel] Fix build errors introduced by vnc jpeg changes |
Date: |
Mon, 28 Feb 2011 21:48:41 +1100 |
User-agent: |
Mutt/1.5.20 (2009-06-14) |
The recent changes to handling of jpegs over tight vnc connections
cause build errors if qemu is configured with --disable-vnc-jpeg. The
patch below corrects the errors, by adding some left out #ifdefs.
Please apply.
Signed-off-by: David Gibson <address@hidden>
---
ui/vnc-enc-tight.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/ui/vnc-enc-tight.c b/ui/vnc-enc-tight.c
index 5933394..2522936 100644
--- a/ui/vnc-enc-tight.c
+++ b/ui/vnc-enc-tight.c
@@ -1536,8 +1536,10 @@ static int send_sub_rect(VncState *vs, int x, int y, int
w, int h)
uint32_t bg = 0, fg = 0;
int colors;
int ret = 0;
+#ifdef CONFIG_VNC_JPEG
bool force_jpeg = false;
bool allow_jpeg = true;
+#endif
vnc_framebuffer_update(vs, x, y, w, h, vs->tight.type);
@@ -1711,6 +1713,7 @@ static int tight_send_framebuffer_update(VncState *vs,
int x, int y,
vs->tight.pixel24 = false;
}
+#ifdef CONFIG_VNC_JPEG
if (vs->tight.quality != (uint8_t)-1) {
double freq = vnc_update_freq(vs, x, y, w, h);
@@ -1718,6 +1721,7 @@ static int tight_send_framebuffer_update(VncState *vs,
int x, int y,
return send_rect_simple(vs, x, y, w, h, false);
}
}
+#endif
if (w * h < VNC_TIGHT_MIN_SPLIT_RECT_SIZE) {
return send_rect_simple(vs, x, y, w, h, true);
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
- [Qemu-devel] Fix build errors introduced by vnc jpeg changes,
David Gibson <=