fixed bug where IndexColorModel was reset when switching to 8bpp from another depth
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@5016 3789f03b-4d11-0410-bbf8-ca57d06f2519
diff --git a/java/com/tigervnc/rfb/PixelBuffer.java b/java/com/tigervnc/rfb/PixelBuffer.java
index 88b3a89..4627318 100644
--- a/java/com/tigervnc/rfb/PixelBuffer.java
+++ b/java/com/tigervnc/rfb/PixelBuffer.java
@@ -41,13 +41,12 @@
case 6:
// Fall-through to depth 8
case 8:
+ if (cm != null && cm instanceof IndexColorModel)
+ break;
int rmask = pf.redMax << pf.redShift;
int gmask = pf.greenMax << pf.greenShift;
int bmask = pf.blueMax << pf.blueShift;
- if (pf.trueColour)
- cm = new DirectColorModel(8, rmask, gmask, bmask);
- else
- cm = new IndexColorModel(8, 256, new byte[256], new byte[256], new byte[256]);
+ cm = new DirectColorModel(8, rmask, gmask, bmask);
break;
case 16:
cm = new DirectColorModel(32, 0xF800, 0x07C0, 0x003E, (0xff << 24));
diff --git a/java/com/tigervnc/vncviewer/BIPixelBuffer.java b/java/com/tigervnc/vncviewer/BIPixelBuffer.java
index 6690c79..ae38302 100644
--- a/java/com/tigervnc/vncviewer/BIPixelBuffer.java
+++ b/java/com/tigervnc/vncviewer/BIPixelBuffer.java
@@ -38,7 +38,7 @@
}
public void updateColourMap() {
- cm = new IndexColorModel(8, nColours, reds, greens, blues);
+ super.updateColourMap();
createImage(width_, height_);
}