summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Beier <dontmind@freeshell.org>2011-03-17 17:00:43 +0100
committerChristian Beier <dontmind@freeshell.org>2011-03-17 17:00:43 +0100
commit62b7acf48009cfad1a54bd8ba04b662f9ac53c80 (patch)
treea096b34a0aa0e771ad3b4c4f4c3ede44938b0243
parentab9fc40aab8fc3a6ec732a9afd87b8786e1046d3 (diff)
downloadlibvncserver-62b7acf48009cfad1a54bd8ba04b662f9ac53c80.zip
libvncserver-62b7acf48009cfad1a54bd8ba04b662f9ac53c80.tar.gz
Fix regression in Ultra encoding introduced by commit fe1ca16e9b75b5f38ab374c8dfff92d2c3ea4532.
My bad. There we see what the encodings test is good for ;-)
-rw-r--r--libvncclient/ultra.c4
-rw-r--r--libvncserver/ultra.c2
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);
OpenPOWER on IntegriCloud