Fixed bugs with cached codebook.

src/main/java/azgracompress/cli/CliConstants.java

@@ -34,8 +34,8 @@ public class CliConstants {
     public static final String WORKER_COUNT_SHORT = "wc";
     public static final String WORKER_COUNT_LONG = "worker-count";
 
-    public static final String CODEBOOK_CACHE_FOLDER_SHORT = "wc";
-    public static final String CODEBOOK_CACHE_FOLDER_LONG = "worker-count";
+    public static final String CODEBOOK_CACHE_FOLDER_SHORT = "cbc";
+    public static final String CODEBOOK_CACHE_FOLDER_LONG = "codebook-cache";
 
     public static final String SCALAR_QUANTIZATION_SHORT = "sq";
     public static final String SCALAR_QUANTIZATION_LONG = "scalar-quantization";

src/main/java/azgracompress/compression/ImageCompressor.java

@@ -98,9 +98,13 @@ public class ImageCompressor extends CompressorDecompressorBase {
     private QCMPFileHeader createHeader() {
         QCMPFileHeader header = new QCMPFileHeader();
 
+
         header.setQuantizationType(options.getQuantizationType());
         header.setBitsPerPixel((byte) options.getBitsPerPixel());
-        header.setCodebookPerPlane(!options.hasReferencePlaneIndex());
+        
+        // Codebook per plane is used only if reference plane isn't set nor is the cache folder.
+        final boolean oneCodebook = options.hasReferencePlaneIndex() || options.hasCodebookCacheFolder();
+        header.setCodebookPerPlane(!oneCodebook);
 
         header.setImageSizeX(options.getImageDimension().getX());
         header.setImageSizeY(options.getImageDimension().getY());

src/main/java/azgracompress/compression/SQImageCompressor.java

@@ -85,6 +85,7 @@ public class SQImageCompressor extends CompressorDecompressorBase implements IIm
             Log("Loading codebook from cache file.");
             quantizer = loadQuantizerFromCache();
             Log("Cached quantizer created.");
+            writeCodebookToOutputStream(quantizer, compressStream);
         } else if (options.hasReferencePlaneIndex()) {
             // TODO(Moravec): Reference plane will be deprecated in favor of 'middle' plane.
             stopwatch.restart();

src/main/java/azgracompress/compression/VQImageCompressor.java

@@ -94,6 +94,7 @@ public class VQImageCompressor extends CompressorDecompressorBase implements IIm
             Log("Loading codebook from cache file.");
             quantizer = loadQuantizerFromCache();
             Log("Cached quantizer created.");
+            writeQuantizerToCompressStream(quantizer, compressStream);
         } else if (options.hasReferencePlaneIndex()) {
             stopwatch.restart();