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/HextileDecoder.java

diff --git a/java/src/com/tightvnc/decoder/HextileDecoder.java b/java/src/com/tightvnc/decoder/HextileDecoder.java
index 9c05309..da7e778 100644
--- a/java/src/com/tightvnc/decoder/HextileDecoder.java
+++ b/java/src/com/tightvnc/decoder/HextileDecoder.java
@@ -46,6 +46,15 @@
 
   public void handleRect(int x, int y, int w, int h) throws IOException,
                                                             Exception {
+
+    //
+    // Write encoding ID to record output stream
+    //
+
+    if (dos != null) {
+      dos.writeInt(HextileDecoder.EncodingHextile);
+    }
+
     hextile_bg = new Color(0);
     hextile_fg = new Color(0);
 
@@ -87,9 +96,16 @@
 
     // Is it a raw-encoded sub-rectangle?
     if ((subencoding & HextileRaw) != 0) {
-      //handleRawRect(tx, ty, tw, th, false);
+      //
+      // Disable encoding id writting to record stream
+      // in super (RawDecoder) class, cause we write subencoding ID
+      // in this class (see code above).
+      //
+
+      super.enableEncodingRecordWritting(false);
       super.handleRect(tx, ty, tw, th);
       super.handleUpdatedPixels(tx, ty, tw, th);
+      super.enableEncodingRecordWritting(true);
       return;
     }