From 62b7acf48009cfad1a54bd8ba04b662f9ac53c80 Mon Sep 17 00:00:00 2001
From: Christian Beier <dontmind@freeshell.org>
Date: Thu, 17 Mar 2011 17:00:43 +0100
Subject: [PATCH] Fix regression in Ultra encoding introduced by commit
 fe1ca16e9b75b5f38ab374c8dfff92d2c3ea4532.

My bad. There we see what the encodings test is good for ;-)
---
 libvncclient/ultra.c | 4 ++--
 libvncserver/ultra.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libvncclient/ultra.c b/libvncclient/ultra.c
index dddb0c0..dac89b5 100644
--- a/libvncclient/ultra.c
+++ b/libvncclient/ultra.c
@@ -57,7 +57,7 @@ HandleUltraBPP (rfbClient* client, int rx, int ry, int rw, int rh)
    * buffer, this buffer allocation should only happen once, on the
    * first update.
    */
-  if ( client->raw_buffer_size < uncompressedBytes) {
+  if ( client->raw_buffer_size < (int)uncompressedBytes) {
     if ( client->raw_buffer != NULL ) {
       free( client->raw_buffer );
     }
@@ -141,7 +141,7 @@ HandleUltraZipBPP (rfbClient* client, int rx, int ry, int rw, int rh)
    * buffer, this buffer allocation should only happen once, on the
    * first update.
    */
-  if ( client->raw_buffer_size < (uncompressedBytes + 500)) {
+  if ( client->raw_buffer_size < (int)(uncompressedBytes + 500)) {
     if ( client->raw_buffer != NULL ) {
       free( client->raw_buffer );
     }
diff --git a/libvncserver/ultra.c b/libvncserver/ultra.c
index 47fab55..9485591 100644
--- a/libvncserver/ultra.c
+++ b/libvncserver/ultra.c
@@ -68,7 +68,7 @@ rfbSendOneRectEncodingUltra(rfbClientPtr cl,
      */
     maxCompSize = (maxRawSize + maxRawSize / 16 + 64 + 3);
 
-    if (cl->afterEncBufSize < maxCompSize) {
+    if (cl->afterEncBufSize < (int)maxCompSize) {
 	cl->afterEncBufSize = maxCompSize;
 	if (cl->afterEncBuf == NULL)
 	    cl->afterEncBuf = (char *)malloc(cl->afterEncBufSize);