commit 2f0294e004bc31cc9329e3e701d33de408a177bf
author enikey <enikey@3789f03b-4d11-0410-bbf8-ca57d06f2519> Wed Dec 24 08:18:54 2008 +0000
committer enikey <enikey@3789f03b-4d11-0410-bbf8-ca57d06f2519> Wed Dec 24 08:18:54 2008 +0000
tree 7d4d85e166d59a236a57b32cbc827c65e959d079
parent 7b0c8aa7c18c7e03191a537d27f2dcfb96c83be4

[Refactoring, cleanup] Write encoding ID of real decoders in decoders classes. Pseudo encoding ID still writes in RfbProto class. ZlibDecoder recoding enabled. ZRLEDecoder recoding still not working.

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@3455 3789f03b-4d11-0410-bbf8-ca57d06f2519

java/src/com/tightvnc/decoder/ZlibDecoder.java

diff --git a/java/src/com/tightvnc/decoder/ZlibDecoder.java b/java/src/com/tightvnc/decoder/ZlibDecoder.java
index 9a167b1..1370da1 100644
--- a/java/src/com/tightvnc/decoder/ZlibDecoder.java
+++ b/java/src/com/tightvnc/decoder/ZlibDecoder.java
@@ -29,6 +29,17 @@
   //
 
   public void handleRect(int x, int y, int w, int h) throws IOException  {
+
+    //
+    // Write encoding ID to record output stream.
+    // Remark: we forced changed encoding from zlib to raw
+    // cause at this moment we cannot save data in zlib encoding.
+    //
+
+    if (dos != null) {
+      dos.writeInt(RawDecoder.EncodingRaw);
+    }
+
     int nBytes = rfbis.readU32();
 
     if (zlibBuf == null || zlibBufLen < nBytes) {
@@ -38,17 +49,6 @@
 
     rfbis.readFully(zlibBuf, 0, nBytes);
 
-    //
-    // FIXME: Now we think that isRecordFromBeggining 
-    // always returns false and this part of code will be never
-    // executed.
-    //
-
-    //if (rec.canWrite() && rec.isRecordFromBeginning()) {
-    // rec.writeIntBE(nBytes);
-    // rec.write(zlibBuf, 0, nBytes);
-    //}
-
     if (zlibInflater == null) {
       zlibInflater = new Inflater();
     }
@@ -60,12 +60,11 @@
           zlibInflater.inflate(pixels8, dy * framebufferWidth + x, w);
 
           //
-          // Save decoded data to data output stream
+          // Save decoded raw data to data output stream
           //
 
-          //if (rec.canWrite() && !rec.isRecordFromBeginning())
-          //if (dos != null)
-          //  dos.write(pixels8, dy * framebufferWidth + x, w);
+          if (dos != null)
+            dos.write(pixels8, dy * framebufferWidth + x, w);
         }
       } else {
         byte[] buf = new byte[w * 4];
@@ -81,12 +80,11 @@
           }
 
           //
-          // Save decoded data to data output stream
+          // Save decoded raw data to data output stream
           //
 
-          //if (rec.canWrite() && !rec.isRecordFromBeginning())
-          //if (dos != null)
-          //  dos.write(buf);
+          if (dos != null)
+            dos.write(buf);
         }
       }
     } catch (DataFormatException ex) {