From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from [140.186.70.92] (port=48932 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Psfed-00030a-RN
	for qemu-devel@nongnu.org; Thu, 24 Feb 2011 13:11:08 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <aliguori@linux.vnet.ibm.com>) id 1Psfec-0007T0-JN
	for qemu-devel@nongnu.org; Thu, 24 Feb 2011 13:11:07 -0500
Received: from e37.co.us.ibm.com ([32.97.110.158]:51466)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <aliguori@linux.vnet.ibm.com>) id 1Psfec-0007So-7Y
	for qemu-devel@nongnu.org; Thu, 24 Feb 2011 13:11:06 -0500
Received: from d03relay02.boulder.ibm.com (d03relay02.boulder.ibm.com
	[9.17.195.227])
	by e37.co.us.ibm.com (8.14.4/8.13.1) with ESMTP id p1OI8UYN027789
	for <qemu-devel@nongnu.org>; Thu, 24 Feb 2011 11:08:31 -0700
Received: from d03av04.boulder.ibm.com (d03av04.boulder.ibm.com [9.17.195.170])
	by d03relay02.boulder.ibm.com (8.13.8/8.13.8/NCO v9.1) with ESMTP id
	p1OIB4P1081348
	for <qemu-devel@nongnu.org>; Thu, 24 Feb 2011 11:11:04 -0700
Received: from d03av04.boulder.ibm.com (loopback [127.0.0.1])
	by d03av04.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP
	id p1OI8ebA031249
	for <qemu-devel@nongnu.org>; Thu, 24 Feb 2011 11:08:40 -0700
Message-ID: <4D669F45.2000607@linux.vnet.ibm.com>
Date: Thu, 24 Feb 2011 12:11:17 -0600
From: Anthony Liguori <aliguori@linux.vnet.ibm.com>
MIME-Version: 1.0
References: <1298563462-22271-1-git-send-email-peter.maydell@linaro.org>
In-Reply-To: <1298563462-22271-1-git-send-email-peter.maydell@linaro.org>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Subject: [Qemu-devel] Re: [PATCH] ui/vnc-enc-tight.c: Fix compile failure if
 CONFIG_VNC_JPEG not defined
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Peter Maydell <peter.maydell@linaro.org>
Cc: Corentin Chary <corentincj@iksaif.net>, qemu-devel@nongnu.org, patches@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);
>