Remove full support for colour maps
Gets rid of a loooot of code and complexity.
Colour map clients are still supported through an
automatically generated map, but we lose the ability to
develop a client or server that uses colour maps
internally.
diff --git a/common/rfb/PixelBuffer.h b/common/rfb/PixelBuffer.h
index 5c4f966..e526cc3 100644
--- a/common/rfb/PixelBuffer.h
+++ b/common/rfb/PixelBuffer.h
@@ -26,7 +26,6 @@
#include <rfb/ImageGetter.h>
#include <rfb/PixelFormat.h>
-#include <rfb/ColourMap.h>
#include <rfb/Rect.h>
#include <rfb/Pixel.h>
@@ -36,7 +35,7 @@
class PixelBuffer : public ImageGetter {
public:
- PixelBuffer(const PixelFormat& pf, int width, int height, ColourMap* cm);
+ PixelBuffer(const PixelFormat& pf, int width, int height);
virtual ~PixelBuffer();
///////////////////////////////////////////////
@@ -49,7 +48,6 @@
virtual void setPF(const PixelFormat &pf);
public:
virtual const PixelFormat &getPF() const;
- virtual ColourMap* getColourMap() const;
// Get width, height and number of pixels
int width() const { return width_; }
@@ -91,7 +89,6 @@
PixelBuffer();
PixelFormat format;
int width_, height_;
- ColourMap* colourmap;
};
// FullFramePixelBuffer
@@ -99,7 +96,7 @@
class FullFramePixelBuffer : public PixelBuffer {
public:
FullFramePixelBuffer(const PixelFormat& pf, int width, int height,
- rdr::U8* data_, ColourMap* cm);
+ rdr::U8* data_);
virtual ~FullFramePixelBuffer();
protected:
@@ -160,15 +157,11 @@
virtual void setPF(const PixelFormat &pf);
virtual void setSize(int w, int h);
- // Assign a colour map to the buffer
- virtual void setColourMap(ColourMap* cm, bool own_cm);
-
// Return the total number of bytes of pixel data in the buffer
int dataLen() const { return width_ * height_ * (format.bpp/8); }
protected:
unsigned long datasize;
- bool own_colourmap;
void checkDataSize();
};