Get rid of internal 'extra' context key

flanglet · Dec 26, 2023 · b3483ef · b3483ef
1 parent 0c907ef
commit b3483ef
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/java/src/main/java/kanzi/app/BlockCompressor.java b/java/src/main/java/kanzi/app/BlockCompressor.java
@@ -321,7 +321,6 @@ public Integer call()
          ctx.put("pool", this.pool);
          ctx.put("entropy", this.codec);
          ctx.put("transform", this.transform);
-         ctx.put("extra", "TPAQX".equals(this.codec));
 
          // Run the task(s)
          if (nbFiles == 1)

diff --git a/java/src/main/java/kanzi/io/CompressedInputStream.java b/java/src/main/java/kanzi/io/CompressedInputStream.java
@@ -153,7 +153,6 @@ protected void readHeader() throws IOException
       {
          this.entropyType = (int) this.ibs.readBits(5);
          this.ctx.put("entropy", EntropyCodecFactory.getName(this.entropyType));
-         this.ctx.put("extra", this.entropyType == EntropyCodecFactory.TPAQX_TYPE);
       }
       catch (IllegalArgumentException e)
       {

diff --git a/java/src/main/java/kanzi/transform/TextCodec.java b/java/src/main/java/kanzi/transform/TextCodec.java
@@ -529,7 +529,7 @@ public TextCodec1(Map<String, Object> ctx)
             if (blockSize >= 8)
                log = Math.max(Math.min(Global.log2(blockSize/8), 26), 13);
 
-            boolean extraPerf = (Boolean) ctx.getOrDefault("extra", false);
+            boolean extraPerf = "TPAQX".equals(ctx.getOrDefault("entropy", ""));
             log += (extraPerf == true) ? 1 : 0;
          }
 
@@ -1072,7 +1072,7 @@ public TextCodec2(Map<String, Object> ctx)
             if (blockSize >= 32)
                log = Math.max(Math.min(Global.log2(blockSize/32), 24), 13);
 
-            boolean extraPerf = (Boolean) ctx.getOrDefault("extra", false);
+            boolean extraPerf = "TPAQX".equals(ctx.getOrDefault("entropy", ""));
             log += (extraPerf == true) ? 1 : 0;
          }