Get rid of unnecessary macros as they are only ever set to a single thing
diff --git a/common/rfb/zrleDecode.h b/common/rfb/zrleDecode.h
index 207a6c7..4bcbf1f 100644
--- a/common/rfb/zrleDecode.h
+++ b/common/rfb/zrleDecode.h
@@ -19,11 +19,8 @@
//
// ZRLE decoding function.
//
-// This file is #included after having set the following macros:
+// This file is #included after having set the following macro:
// BPP - 8, 16 or 32
-// EXTRA_ARGS - optional extra arguments
-// FILL_RECT - fill a rectangle with a single colour
-// IMAGE_RECT - draw a rectangle of pixel data from a buffer
#include <stdio.h>
#include <rdr/InStream.h>
@@ -50,11 +47,8 @@
#endif
void ZRLE_DECODE (const Rect& r, rdr::InStream* is,
- rdr::ZlibInStream* zis, PIXEL_T* buf
-#ifdef EXTRA_ARGS
- , EXTRA_ARGS
-#endif
- )
+ rdr::ZlibInStream* zis, PIXEL_T* buf,
+ CMsgHandler* handler)
{
int length = is->readU32();
zis->setUnderlying(is, length);
@@ -79,7 +73,7 @@
if (palSize == 1) {
PIXEL_T pix = palette[0];
- FILL_RECT(t,pix);
+ handler->fillRect(t, pix);
continue;
}
@@ -179,7 +173,7 @@
//fprintf(stderr,"copying data to screen %dx%d at %d,%d\n",
//t.width(),t.height(),t.tl.x,t.tl.y);
- IMAGE_RECT(t,buf);
+ handler->imageRect(t, buf);
}
}