SabreTools/SabreTools.Compression
1
0
Fork 0
mirror of https://github.com/SabreTools/SabreTools.Compression.git synced 2026-07-10 10:56:58 +00:00
Code Issues Packages Projects Releases 19 Wiki Activity

Make header reading consistent

Browse Source
This commit is contained in:
Matt Nadareski
2023-09-22 11:59:46 -04:00
parent 8174af616f
commit 5e21a09fd1
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
MSZIP/DeflateDecompressor.cs
View File

@@ -118,9 +118,10 @@ namespace SabreTools.Compression.MSZIP
/// <summary>
/// Read a FixedHuffmanCompressedBlockHeader from the input stream
/// </summary>
private FixedHuffmanCompressedBlockHeader ReadFixedHuffmanCompressedBlockHeader()
private (FixedHuffmanCompressedBlockHeader, uint, uint) ReadFixedHuffmanCompressedBlockHeader()
{
return new FixedHuffmanCompressedBlockHeader();
// Nothing needs to be read, all values are fixed
return (new FixedHuffmanCompressedBlockHeader(), 288, 30);
}
/// <summary>
@@ -190,11 +191,11 @@ namespace SabreTools.Compression.MSZIP
var bytes = new List<byte>();
// Get the fixed huffman header
var header = ReadFixedHuffmanCompressedBlockHeader();
(var header, uint numLiteral, uint numDistance) = ReadFixedHuffmanCompressedBlockHeader();
// Make the literal and distance trees
HuffmanDecoder literalTree = new HuffmanDecoder(header.LiteralLengths, 288);
HuffmanDecoder distanceTree = new HuffmanDecoder(header.DistanceCodes, 30);
HuffmanDecoder literalTree = new HuffmanDecoder(header.LiteralLengths, numLiteral);
HuffmanDecoder distanceTree = new HuffmanDecoder(header.DistanceCodes, numDistance);
// Now loop and decode
return ReadHuffmanBlock(literalTree, distanceTree);