diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/com/tigervnc/rfb/PixelBuffer.java | 7 | ||||
| -rw-r--r-- | java/com/tigervnc/vncviewer/BIPixelBuffer.java | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/java/com/tigervnc/rfb/PixelBuffer.java b/java/com/tigervnc/rfb/PixelBuffer.java index 88b3a89e..4627318d 100644 --- a/java/com/tigervnc/rfb/PixelBuffer.java +++ b/java/com/tigervnc/rfb/PixelBuffer.java @@ -41,13 +41,12 @@ public class PixelBuffer { 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 6690c79f..ae38302c 100644 --- a/java/com/tigervnc/vncviewer/BIPixelBuffer.java +++ b/java/com/tigervnc/vncviewer/BIPixelBuffer.java @@ -38,7 +38,7 @@ public class BIPixelBuffer extends PlatformPixelBuffer implements ImageObserver } public void updateColourMap() { - cm = new IndexColorModel(8, nColours, reds, greens, blues); + super.updateColourMap(); createImage(width_, height_); } |