tidying

README.md

@@ -30,7 +30,7 @@
 * [Usage](resources/usage.md)
 
 ### Installation
-* Install the **latest** version of the [Open JDK](https://jdk.java.net/16/) or [AdoptOpenJDK](https://adoptopenjdk.net).
+* Install the **latest** version of the [JDK](https://www.oracle.com/java/technologies/downloads/).
 * Download DiskBrowser.jar from the [releases](https://github.com/dmolony/diskbrowser/releases) page.
 * Double-click the jar file, or enter 'java -jar DiskBrowser.jar' in the terminal.
 * Set your root folder (the top-level folder where you keep your disk images).

src/com/bytezone/diskbrowser/applefile/HiResImage.java

@@ -109,7 +109,8 @@ public abstract class HiResImage extends AbstractFile
   // 6 Dream Grafix v1.02.po
 
   // see also - https://docs.google.com/spreadsheets/d
-  //           /1rKR6A_bVniSCtIP_rrv8QLWJdj4h6jEU1jJj0AebWwg/edit#gid=0
+  // . /1rKR6A_bVniSCtIP_rrv8QLWJdj4h6jEU1jJj0AebWwg/edit#gid=0
+  // also - http://lukazi.blogspot.com/2017/03/double-high-resolution-graphics-dhgr.html
 
   static PaletteFactory paletteFactory = new PaletteFactory ();
 

src/com/bytezone/diskbrowser/applefile/SHRPictureFile1.java

@@ -23,6 +23,7 @@ public class SHRPictureFile1 extends HiResImage
   // ---------------------------------------------------------------------------------//
   {
     super (name, buffer, fileType, auxType, eof);
+    System.out.println ("here");
 
     int ptr = 0;
     while (ptr < buffer.length)

src/com/bytezone/diskbrowser/nufx/LZW3.java

@@ -44,10 +44,10 @@ public class LZW3
 
     initTable ();
 
-    bitOffset = 0;
+    int a;
+    int y;
 
-    int a = 0;
-    int y = 0;
+    bitOffset = 0;
 
     while (true)
     {
@@ -57,7 +57,7 @@ public class LZW3
         return -1;
       }
 
-      readCode ();                      // sets iCode
+      iCode = readCode ();
 
       if (iCode == EOF_CODE)
         break;
@@ -65,7 +65,7 @@ public class LZW3
       if (iCode == CLEAR_CODE)
       {
         initTable ();
-        readCode ();                    // sets iCode
+        iCode = readCode ();
 
         oldCode = iCode;
         k = iCode;
@@ -90,7 +90,6 @@ public class LZW3
         a = hashNext[y];
       }
 
-//      a &= 0xFF;        // should already be in 8 bits
       finChar = a;
       k = a;
       y = 0;
@@ -134,19 +133,21 @@ public class LZW3
   }
 
   // ---------------------------------------------------------------------------------//
-  private void readCode ()
+  private int readCode ()
   // ---------------------------------------------------------------------------------//
   {
     int bitIdx = bitOffset & 0x07;
     int byteIdx = bitOffset >>> 3;          // no sign extension
 
-    iCode = srcBuf[byteIdx] & 0xFF | (srcBuf[byteIdx + 1] & 0xFF) << 8
+    int iCode = srcBuf[byteIdx] & 0xFF | (srcBuf[byteIdx + 1] & 0xFF) << 8
         | (srcBuf[byteIdx + 2] & 0xFF) << 16;
 
     iCode >>>= bitIdx;
     iCode &= nBitMask;
 
     bitOffset += nBitMod1;
+
+    return iCode;
   }
 
   // ---------------------------------------------------------------------------------//