Patchwork Fix build errors introduced by vnc jpeg changes

login
register
mail settings
Submitter David Gibson
Date Feb. 28, 2011, 10:48 a.m.
Message ID <20110228104841.GD10873@yookeroo>
Download mbox | patch
Permalink /patch/84779/
State New
Headers show

Comments

David Gibson - Feb. 28, 2011, 10:48 a.m.
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 <david@gibson.dropbear.id.au>

---
 ui/vnc-enc-tight.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
Peter Maydell - Feb. 28, 2011, 11:15 a.m.
On 28 February 2011 10:48, David Gibson <david@gibson.dropbear.id.au> wrote:
> 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 <david@gibson.dropbear.id.au>

This is already fixed in master:

http://git.qemu.org/qemu.git/commit/?id=cf76a1ce8b7cf4b92429d67d3f4626a92b2d8a37

-- PMM
David Gibson - Feb. 28, 2011, 12:03 p.m.
On Mon, Feb 28, 2011 at 11:15:51AM +0000, Peter Maydell wrote:
> On 28 February 2011 10:48, David Gibson <david@gibson.dropbear.id.au> wrote:
> > 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 <david@gibson.dropbear.id.au>
> 
> This is already fixed in master:
> 
> http://git.qemu.org/qemu.git/commit/?id=cf76a1ce8b7cf4b92429d67d3f4626a92b2d8a37

Ah, sorry.  Sent that mail several days ago, but it got stuck due to a
mail configuration error.  Forgot to recheck when I unstuck it.

Patch

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);