diff --git a/Libraries/LibCompress/Deflate.cpp b/Libraries/LibCompress/Deflate.cpp index 6c43983f8b..6792dc0590 100644 --- a/Libraries/LibCompress/Deflate.cpp +++ b/Libraries/LibCompress/Deflate.cpp @@ -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 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 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. diff --git a/Libraries/LibCompress/Deflate.h b/Libraries/LibCompress/Deflate.h index 9cdd1bda57..10671515cd 100644 --- a/Libraries/LibCompress/Deflate.h +++ b/Libraries/LibCompress/Deflate.h @@ -97,7 +97,7 @@ public: static Optional decompress_all(ReadonlyBytes); private: - u32 decode_run_length(u32); + u32 decode_length(u32); u32 decode_distance(u32); void decode_codes(CanonicalCode& literal_code, Optional& distance_code);