RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 00:27:43 +00:00
Code Issues Activity Actions

LibCompress: Remove unnecessary InputBitStream.

Browse source
This commit is contained in:
asynts 2020-09-08 17:46:19 +02:00 • committed by Andreas Kling
parent 4af8eea56f
commit 49e6ff8958
2 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Libraries/LibCompress/Deflate.cpp
View file

@ -143,10 +143,10 @@ bool DeflateDecompressor::CompressedBlock::try_read_more()
return false;
}
const auto run_length = m_decompressor.decode_run_length(symbol);
const auto length = m_decompressor.decode_length(symbol);
const auto distance = m_decompressor.decode_distance(m_distance_codes.value().read_symbol(m_decompressor.m_input_stream));
for (size_t idx = 0; idx < run_length; ++idx) {
for (size_t idx = 0; idx < length; ++idx) {
u8 byte = 0;
m_decompressor.m_output_stream.read({ &byte, sizeof(byte) }, distance);
m_decompressor.m_output_stream << byte;
@ -306,8 +306,7 @@ bool DeflateDecompressor::eof() const { return m_state == State::Idle && m_read_
Optional<ByteBuffer> DeflateDecompressor::decompress_all(ReadonlyBytes bytes)
{
InputMemoryStream memory_stream { bytes };
InputBitStream bit_stream { memory_stream };
DeflateDecompressor deflate_stream { bit_stream };
DeflateDecompressor deflate_stream { memory_stream };
OutputMemoryStream output_stream;
u8 buffer[4096];
@ -322,7 +321,7 @@ Optional<ByteBuffer> DeflateDecompressor::decompress_all(ReadonlyBytes bytes)
return output_stream.copy_into_contiguous_buffer();
}
u32 DeflateDecompressor::decode_run_length(u32 symbol)
u32 DeflateDecompressor::decode_length(u32 symbol)
{
// FIXME: I can't quite follow the algorithm here, but it seems to work.