Don't include palette to full color methods

They have no need for it, so let's simplify things.

diff --git a/common/rfb/TightEncoder.cxx b/common/rfb/TightEncoder.cxx
index 5cce03e9ae4b413bb8dc83c978692ac48e5d8f32..1143ebcf18ac0fa252cac071c6929eab27c90c87 100644 (file)
--- a/common/rfb/TightEncoder.cxx
+++ b/common/rfb/TightEncoder.cxx
@@ -89,7 +89,7 @@ void TightEncoder::writeRect(const PixelBuffer* pb, const Palette& palette)
 {
   switch (palette.size()) {
   case 0:
-    writeFullColourRect(pb, palette);
+    writeFullColourRect(pb);
     break;
   case 1:
     Encoder::writeSolidRect(pb, palette);
@@ -154,11 +154,11 @@ void TightEncoder::writeIndexedRect(const PixelBuffer* pb, const Palette& palett
     break;
   default:
     // It's more efficient to just do raw pixels
-    writeFullColourRect(pb, palette);
+    writeFullColourRect(pb);
   }
 }
 
-void TightEncoder::writeFullColourRect(const PixelBuffer* pb, const Palette& palette)
+void TightEncoder::writeFullColourRect(const PixelBuffer* pb)
 {
   const int streamId = 0;
 

diff --git a/common/rfb/TightEncoder.h b/common/rfb/TightEncoder.h
index 7bce26422ff799e34934b000798b07d508a668c7..b96bc4c63c80517ffd3ab4dd94202e5af0952aad 100644 (file)
--- a/common/rfb/TightEncoder.h
+++ b/common/rfb/TightEncoder.h
@@ -43,7 +43,7 @@ namespace rfb {
   protected:
     void writeMonoRect(const PixelBuffer* pb, const Palette& palette);
     void writeIndexedRect(const PixelBuffer* pb, const Palette& palette);
-    void writeFullColourRect(const PixelBuffer* pb, const Palette& palette);
+    void writeFullColourRect(const PixelBuffer* pb);
 
     void writePixels(const rdr::U8* buffer, const PixelFormat& pf,
                      unsigned int count, rdr::OutStream* os);

diff --git a/common/rfb/ZRLEEncoder.cxx b/common/rfb/ZRLEEncoder.cxx
index ff70c6eef541a5881fb3230932e4be9f61dfa7a4..7d98540159f732279b866c8e19fa5ba99b7dcb62 100644 (file)
--- a/common/rfb/ZRLEEncoder.cxx
+++ b/common/rfb/ZRLEEncoder.cxx
@@ -76,7 +76,7 @@ void ZRLEEncoder::writeRect(const PixelBuffer* pb, const Palette& palette)
         tile.br.x = pb->width();
 
       if (palette.size() == 0)
-        writeRawTile(tile, pb, palette);
+        writeRawTile(tile, pb);
       else if (palette.size() <= 16)
         writePaletteTile(tile, pb, palette);
       else
@@ -171,8 +171,7 @@ void ZRLEEncoder::writePaletteRLETile(const Rect& tile, const PixelBuffer* pb,
   }
 }
 
-void ZRLEEncoder::writeRawTile(const Rect& tile, const PixelBuffer* pb,
-                               const Palette& palette)
+void ZRLEEncoder::writeRawTile(const Rect& tile, const PixelBuffer* pb)
 {
   const rdr::U8* buffer;
   int stride;

diff --git a/common/rfb/ZRLEEncoder.h b/common/rfb/ZRLEEncoder.h
index d61bab17472c9da21255b4d05cfc35fa8667bf69..37a3be2db3b3d31f447a850449d9d21b2e0c291e 100644 (file)
--- a/common/rfb/ZRLEEncoder.h
+++ b/common/rfb/ZRLEEncoder.h
@@ -42,8 +42,7 @@ namespace rfb {
                           const Palette& palette);
     void writePaletteRLETile(const Rect& tile, const PixelBuffer* pb,
                              const Palette& palette);
-    void writeRawTile(const Rect& tile, const PixelBuffer* pb,
-                      const Palette& palette);
+    void writeRawTile(const Rect& tile, const PixelBuffer* pb);
 
     void writePalette(const PixelFormat& pf, const Palette& palette);