qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Anthony Liguori <aliguori@linux.vnet.ibm.com>
To: Peter Maydell <peter.maydell@linaro.org>
Cc: Corentin Chary <corentincj@iksaif.net>,
	qemu-devel@nongnu.org, patches@linaro.org
Subject: [Qemu-devel] Re: [PATCH] ui/vnc-enc-tight.c: Fix compile failure if CONFIG_VNC_JPEG not defined
Date: Thu, 24 Feb 2011 12:11:17 -0600	[thread overview]
Message-ID: <4D669F45.2000607@linux.vnet.ibm.com> (raw)
In-Reply-To: <1298563462-22271-1-git-send-email-peter.maydell@linaro.org>

On 02/24/2011 10:04 AM, Peter Maydell wrote:
> Add some missing #ifdefs to fix compilation failures in the !CONFIG_VNC_JPEG
> case introduced by commit ce702e93.
>
> Signed-off-by: Peter Maydell<peter.maydell@linaro.org>
>    

Applied.  Thanks.

Regards,

Anthony Liguori

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

      parent reply	other threads:[~2011-02-24 18:11 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-02-24 16:04 [Qemu-devel] [PATCH] ui/vnc-enc-tight.c: Fix compile failure if CONFIG_VNC_JPEG not defined Peter Maydell
2011-02-24 16:27 ` [Qemu-devel] " Corentin Chary
2011-02-24 18:11 ` Anthony Liguori [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4D669F45.2000607@linux.vnet.ibm.com \
    --to=aliguori@linux.vnet.ibm.com \
    --cc=corentincj@iksaif.net \
    --cc=patches@linaro.org \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).