Commit 62b7acf4 authored by Christian Beier's avatar Christian Beier

Fix regression in Ultra encoding introduced by commit fe1ca16e.

My bad. There we see what the encodings test is good for ;-)
parent ab9fc40a
...@@ -57,7 +57,7 @@ HandleUltraBPP (rfbClient* client, int rx, int ry, int rw, int rh) ...@@ -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 * buffer, this buffer allocation should only happen once, on the
* first update. * first update.
*/ */
if ( client->raw_buffer_size < uncompressedBytes) { if ( client->raw_buffer_size < (int)uncompressedBytes) {
if ( client->raw_buffer != NULL ) { if ( client->raw_buffer != NULL ) {
free( client->raw_buffer ); free( client->raw_buffer );
} }
...@@ -141,7 +141,7 @@ HandleUltraZipBPP (rfbClient* client, int rx, int ry, int rw, int rh) ...@@ -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 * buffer, this buffer allocation should only happen once, on the
* first update. * first update.
*/ */
if ( client->raw_buffer_size < (uncompressedBytes + 500)) { if ( client->raw_buffer_size < (int)(uncompressedBytes + 500)) {
if ( client->raw_buffer != NULL ) { if ( client->raw_buffer != NULL ) {
free( client->raw_buffer ); free( client->raw_buffer );
} }
......
...@@ -68,7 +68,7 @@ rfbSendOneRectEncodingUltra(rfbClientPtr cl, ...@@ -68,7 +68,7 @@ rfbSendOneRectEncodingUltra(rfbClientPtr cl,
*/ */
maxCompSize = (maxRawSize + maxRawSize / 16 + 64 + 3); maxCompSize = (maxRawSize + maxRawSize / 16 + 64 + 3);
if (cl->afterEncBufSize < maxCompSize) { if (cl->afterEncBufSize < (int)maxCompSize) {
cl->afterEncBufSize = maxCompSize; cl->afterEncBufSize = maxCompSize;
if (cl->afterEncBuf == NULL) if (cl->afterEncBuf == NULL)
cl->afterEncBuf = (char *)malloc(cl->afterEncBufSize); cl->afterEncBuf = (char *)malloc(cl->afterEncBufSize);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment