summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorenikey <enikey@3789f03b-4d11-0410-bbf8-ca57d06f2519>2008-12-19 09:19:59 +0000
committerenikey <enikey@3789f03b-4d11-0410-bbf8-ca57d06f2519>2008-12-19 09:19:59 +0000
commit4582bab2f2cbf744a0cb7da17b38d424b15444ea (patch)
treedec9e251f12aed2ac62e7ccbaf4ec35d798b9173
parentc41ba1d1ab0661120199802669d6eccc268684eb (diff)
downloadtigervnc-4582bab2f2cbf744a0cb7da17b38d424b15444ea.tar.gz
tigervnc-4582bab2f2cbf744a0cb7da17b38d424b15444ea.zip
[BugFix] Decoder zlibDecoder was not created in constructor VncCanvas and application falls with NullPointerException when it tries to set session recorder for this decoder.
[Developement] Decoders updates their params (framebuffer size and bpp) in updateFramebufferSize method. git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@3436 3789f03b-4d11-0410-bbf8-ca57d06f2519
-rw-r--r--java/src/com/tightvnc/vncviewer/VncCanvas.java27
1 files changed, 27 insertions, 0 deletions
diff --git a/java/src/com/tightvnc/vncviewer/VncCanvas.java b/java/src/com/tightvnc/vncviewer/VncCanvas.java
index 4cd82af2..51761c09 100644
--- a/java/src/com/tightvnc/vncviewer/VncCanvas.java
+++ b/java/src/com/tightvnc/vncviewer/VncCanvas.java
@@ -164,6 +164,7 @@ class VncCanvas extends Canvas
correDecoder = new CoRREDecoder(memGraphics, rfbis);
hextileDecoder = new HextileDecoder(memGraphics, rfbis);
tightDecoder = new TightDecoder(memGraphics, rfbis);
+ zlibDecoder = new ZlibDecoder(memGraphics, rfbis);
zrleDecoder = new ZRLEDecoder(memGraphics, rfbis);
//
@@ -379,6 +380,32 @@ class VncCanvas extends Canvas
}
}
+ //
+ // Update decoders
+ //
+
+ //
+ // FIXME: Why decoders can be null here?
+ //
+
+ if (decoders != null) {
+ for (int i = 0; i < decoders.length; i++) {
+ //
+ // Set changes to every decoder that we can use
+ //
+
+ decoders[i].setBPP(bytesPixel);
+ decoders[i].setFrameBufferSize(fbWidth, fbHeight);
+ decoders[i].setGraphics(memGraphics);
+
+ //
+ // Update decoder
+ //
+
+ decoders[i].update();
+ }
+ }
+
// Images with raw pixels should be re-allocated on every change
// of geometry or pixel format.
if (bytesPixel == 1) {