Run optimisations on merged blocks

NeRdTheNed · Nov 12, 2023 · 65be1b8 · 65be1b8
1 parent a25bcd5
commit 65be1b8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/deft4j-base/src/main/java/com/github/NeRdTheNed/deft4j/deflate/DeflateStream.java b/deft4j-base/src/main/java/com/github/NeRdTheNed/deft4j/deflate/DeflateStream.java
@@ -585,7 +585,7 @@ public long mergeBlocks() {
                 pos += 3;
 
                 if ((nextBlock != null) && currentBlock.canMerge(nextBlock)) {
-                    final DeflateBlock merged = currentBlock.merge(nextBlock);
+                    final DeflateBlock merged = optimiseBlock(currentBlock.merge(nextBlock), pos);
                     final long currentSizeNoMerge = currentBlock.getSizeBits(pos);
                     final long nextSizeNoMerge = nextBlock.getSizeBits(pos + currentSizeNoMerge + 3);
                     final long currentSaved = (currentSizeNoMerge + 3 + nextSizeNoMerge) - merged.getSizeBits(pos);

diff --git a/test/asyoulik/asyoulik-gzip-opt.txt.gz b/test/asyoulik/asyoulik-gzip-opt.txt.gz
diff --git a/test/asyoulik/asyoulik-gzip-opt.txt.gz.txt b/test/asyoulik/asyoulik-gzip-opt.txt.gz.txt
@@ -1,4 +1,4 @@
 File type recognised as GZip
-165 bits saved in stream 0 (unnamed stream)
-Total bits saved 165
-Saved 165 bits with optimisation
+167 bits saved in stream 0 (unnamed stream)
+Total bits saved 167
+Saved 167 bits with optimisation