Get rid of unnecessary macros as they are only ever set to a single thing
diff --git a/common/rfb/hextileEncodeBetter.h b/common/rfb/hextileEncodeBetter.h
index e1730ba..3a96ab6 100644
--- a/common/rfb/hextileEncodeBetter.h
+++ b/common/rfb/hextileEncodeBetter.h
@@ -19,10 +19,8 @@
//
// Hextile encoding 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
-// GET_IMAGE_INTO_BUF - gets a rectangle of pixel data into a buffer
#include <rdr/OutStream.h>
#include <rfb/hextileConstants.h>
@@ -277,11 +275,7 @@
// Main encoding function.
//
-void HEXTILE_ENCODE(const Rect& r, rdr::OutStream* os
-#ifdef EXTRA_ARGS
- , EXTRA_ARGS
-#endif
- )
+void HEXTILE_ENCODE(const Rect& r, rdr::OutStream* os, TransImageGetter *ig)
{
Rect t;
PIXEL_T buf[256];
@@ -300,7 +294,7 @@
t.br.x = __rfbmin(r.br.x, t.tl.x + 16);
- GET_IMAGE_INTO_BUF(t,buf);
+ ig->getImage(buf, t);
tile.newTile(buf, t.width(), t.height());
int tileType = tile.getFlags();