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

LibCompress: Remove DuplexMemoryStream from DeflateDecompressor

Browse source
This commit is contained in:
Tim Schumacher 2023-01-01 00:50:18 +01:00 • committed by Andrew Kaster
parent 100112134d
commit 0d69fbd19f
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Userland/Libraries/LibCompress/Deflate.cpp
View file

@ -9,7 +9,6 @@
#include <AK/Assertions.h> #include <AK/Assertions.h>
#include <AK/BinaryHeap.h> #include <AK/BinaryHeap.h>
#include <AK/BinarySearch.h> #include <AK/BinarySearch.h>
#include <AK/MemoryStream.h>
#include <LibCore/MemoryStream.h> #include <LibCore/MemoryStream.h>
#include <string.h> #include <string.h>
@ -317,15 +316,17 @@ ErrorOr<ByteBuffer> DeflateDecompressor::decompress_all(ReadonlyBytes bytes)
{ {
auto memory_stream = TRY(Core::Stream::FixedMemoryStream::construct(bytes)); auto memory_stream = TRY(Core::Stream::FixedMemoryStream::construct(bytes));
auto deflate_stream = TRY(DeflateDecompressor::construct(move(memory_stream))); auto deflate_stream = TRY(DeflateDecompressor::construct(move(memory_stream)));
DuplexMemoryStream output_stream; Core::Stream::AllocatingMemoryStream output_stream;
auto buffer = TRY(ByteBuffer::create_uninitialized(4096)); auto buffer = TRY(ByteBuffer::create_uninitialized(4096));
while (!deflate_stream->is_eof()) { while (!deflate_stream->is_eof()) {
auto const slice = TRY(deflate_stream->read(buffer)); auto const slice = TRY(deflate_stream->read(buffer));
output_stream.write_or_error(slice); TRY(output_stream.write_entire_buffer(slice));
} }
return output_stream.copy_into_contiguous_buffer(); auto output_buffer = TRY(ByteBuffer::create_uninitialized(output_stream.used_buffer_size()));
TRY(output_stream.read_entire_buffer(output_buffer));
return output_buffer;
} }
ErrorOr<u32> DeflateDecompressor::decode_length(u32 symbol) ErrorOr<u32> DeflateDecompressor::decode_length(u32 symbol)