Get rid of unnecessary macros as they are only ever set to a single thing
diff --git a/common/rfb/rreDecode.h b/common/rfb/rreDecode.h
index 1f5bdf8..d37461f 100644
--- a/common/rfb/rreDecode.h
+++ b/common/rfb/rreDecode.h
@@ -18,10 +18,8 @@
//
// RRE 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
#include <rdr/InStream.h>
@@ -38,15 +36,11 @@
#define READ_PIXEL CONCAT2E(readOpaque,BPP)
#define RRE_DECODE CONCAT2E(rreDecode,BPP)
-void RRE_DECODE (const Rect& r, rdr::InStream* is
-#ifdef EXTRA_ARGS
- , EXTRA_ARGS
-#endif
- )
+void RRE_DECODE (const Rect& r, rdr::InStream* is, CMsgHandler* handler)
{
int nSubrects = is->readU32();
PIXEL_T bg = is->READ_PIXEL();
- FILL_RECT(r, bg);
+ handler->fillRect(r, bg);
for (int i = 0; i < nSubrects; i++) {
PIXEL_T pix = is->READ_PIXEL();
@@ -54,7 +48,7 @@
int y = is->readU16();
int w = is->readU16();
int h = is->readU16();
- FILL_RECT(Rect(r.tl.x+x, r.tl.y+y, r.tl.x+x+w, r.tl.y+y+h), pix);
+ handler->fillRect(Rect(r.tl.x+x, r.tl.y+y, r.tl.x+x+w, r.tl.y+y+h), pix);
}
}