Don't force encoders to specify palette size

Most encoders don't have a palette mode, so don't force them to
specify a dummy value to the Encoder base class constructor.

diff --git a/common/rfb/Encoder.h b/common/rfb/Encoder.h
index 66a10d26a01b7c75229b16b7c824bf27c1aab0da..1e57fda513dd7a49d1b9332907ed1ef6abbbd76f 100644 (file)
--- a/common/rfb/Encoder.h
+++ b/common/rfb/Encoder.h
@@ -42,7 +42,7 @@ namespace rfb {
   class Encoder {
   public:
     Encoder(SConnection* conn, int encoding,
-            enum EncoderFlags flags, unsigned int maxPaletteSize);
+            enum EncoderFlags flags, unsigned int maxPaletteSize=-1);
     virtual ~Encoder();
 
     // isSupported() should return a boolean indicating if this encoder

diff --git a/common/rfb/HextileEncoder.cxx b/common/rfb/HextileEncoder.cxx
index 418a44048672922b6f375f5dbe3d76812ae14a75..47e5251032d314d37338944b3e3ded21e7431243 100644 (file)
--- a/common/rfb/HextileEncoder.cxx
+++ b/common/rfb/HextileEncoder.cxx
@@ -45,7 +45,7 @@ BoolParameter improvedHextile("ImprovedHextile",
 #undef BPP
 
 HextileEncoder::HextileEncoder(SConnection* conn) :
-  Encoder(conn, encodingHextile, EncoderPlain, -1)
+  Encoder(conn, encodingHextile, EncoderPlain)
 {
 }
 

diff --git a/common/rfb/RREEncoder.cxx b/common/rfb/RREEncoder.cxx
index 60a06633c34481ace2ec5eb267bcd1eafa2c9667..7287e7eb5b4cdc93447910077343167e444db2d5 100644 (file)
--- a/common/rfb/RREEncoder.cxx
+++ b/common/rfb/RREEncoder.cxx
@@ -37,7 +37,7 @@ using namespace rfb;
 #undef BPP
 
 RREEncoder::RREEncoder(SConnection* conn) :
-  Encoder(conn, encodingRRE, EncoderPlain, -1)
+  Encoder(conn, encodingRRE, EncoderPlain)
 {
 }
 

diff --git a/common/rfb/RawEncoder.cxx b/common/rfb/RawEncoder.cxx
index 409042719ac75f6992de53edeaefa519ded0d2d5..b12cf06f6f914466c4e2abe816ad35a17e7826ed 100644 (file)
--- a/common/rfb/RawEncoder.cxx
+++ b/common/rfb/RawEncoder.cxx
@@ -25,7 +25,7 @@
 using namespace rfb;
 
 RawEncoder::RawEncoder(SConnection* conn) :
-  Encoder(conn, encodingRaw, EncoderPlain, -1)
+  Encoder(conn, encodingRaw, EncoderPlain)
 {
 }
 

diff --git a/common/rfb/TightJPEGEncoder.cxx b/common/rfb/TightJPEGEncoder.cxx
index 385207f7a66384d59224a663e03425f323ec7707..5d39b62c2f5360ebaf2bb04f712493f4789b8213 100644 (file)
--- a/common/rfb/TightJPEGEncoder.cxx
+++ b/common/rfb/TightJPEGEncoder.cxx
@@ -64,7 +64,7 @@ static const struct TightJPEGConfiguration conf[10] = {
 
 
 TightJPEGEncoder::TightJPEGEncoder(SConnection* conn) :
-  Encoder(conn, encodingTight, (EncoderFlags)(EncoderUseNativePF | EncoderLossy), -1),
+  Encoder(conn, encodingTight, (EncoderFlags)(EncoderUseNativePF | EncoderLossy)),
   qualityLevel(-1), fineQuality(-1), fineSubsampling(subsampleUndefined)
 {
 }