diff --git a/Tests/LibCompress/TestZlib.cpp b/Tests/LibCompress/TestZlib.cpp index 641a0b31e66..4ba56f8d7b4 100644 --- a/Tests/LibCompress/TestZlib.cpp +++ b/Tests/LibCompress/TestZlib.cpp @@ -20,7 +20,7 @@ TEST_CASE(zlib_decompress_simple) const u8 uncompressed[] = "This is a simple text file :)"; - auto const decompressed = Compress::Zlib::decompress_all(compressed); + auto const decompressed = Compress::ZlibDecompressor::decompress_all(compressed); EXPECT(decompressed.value().bytes() == (ReadonlyBytes { uncompressed, sizeof(uncompressed) - 1 })); } diff --git a/Userland/Libraries/LibCompress/Zlib.cpp b/Userland/Libraries/LibCompress/Zlib.cpp index 2bd5a6716f7..d39bdcbb373 100644 --- a/Userland/Libraries/LibCompress/Zlib.cpp +++ b/Userland/Libraries/LibCompress/Zlib.cpp @@ -15,7 +15,7 @@ namespace Compress { constexpr static size_t Adler32Size = sizeof(u32); -Optional Zlib::try_create(ReadonlyBytes data) +Optional ZlibDecompressor::try_create(ReadonlyBytes data) { if (data.size() < (sizeof(ZlibHeader) + Adler32Size)) return {}; @@ -31,18 +31,18 @@ Optional Zlib::try_create(ReadonlyBytes data) if (header.as_u16 % 31 != 0) return {}; // error correction code doesn't match - Zlib zlib { header, data }; + ZlibDecompressor zlib { header, data }; zlib.m_data_bytes = data.slice(2, data.size() - sizeof(ZlibHeader) - Adler32Size); return zlib; } -Zlib::Zlib(ZlibHeader header, ReadonlyBytes data) +ZlibDecompressor::ZlibDecompressor(ZlibHeader header, ReadonlyBytes data) : m_header(header) , m_input_data(data) { } -Optional Zlib::decompress() +Optional ZlibDecompressor::decompress() { auto buffer_or_error = DeflateDecompressor::decompress_all(m_data_bytes); if (buffer_or_error.is_error()) @@ -50,7 +50,7 @@ Optional Zlib::decompress() return buffer_or_error.release_value(); } -Optional Zlib::decompress_all(ReadonlyBytes bytes) +Optional ZlibDecompressor::decompress_all(ReadonlyBytes bytes) { auto zlib = try_create(bytes); if (!zlib.has_value()) @@ -58,7 +58,7 @@ Optional Zlib::decompress_all(ReadonlyBytes bytes) return zlib->decompress(); } -u32 Zlib::checksum() +u32 ZlibDecompressor::checksum() { if (!m_checksum) { auto bytes = m_input_data.slice_from_end(Adler32Size); diff --git a/Userland/Libraries/LibCompress/Zlib.h b/Userland/Libraries/LibCompress/Zlib.h index c526d5c1232..a69d91d6ce5 100644 --- a/Userland/Libraries/LibCompress/Zlib.h +++ b/Userland/Libraries/LibCompress/Zlib.h @@ -42,16 +42,16 @@ struct ZlibHeader { }; static_assert(sizeof(ZlibHeader) == sizeof(u16)); -class Zlib { +class ZlibDecompressor { public: Optional decompress(); u32 checksum(); - static Optional try_create(ReadonlyBytes data); + static Optional try_create(ReadonlyBytes data); static Optional decompress_all(ReadonlyBytes); private: - Zlib(ZlibHeader, ReadonlyBytes data); + ZlibDecompressor(ZlibHeader, ReadonlyBytes data); ZlibHeader m_header; diff --git a/Userland/Libraries/LibGfx/Font/WOFF/Font.cpp b/Userland/Libraries/LibGfx/Font/WOFF/Font.cpp index 2106b5104b7..43edf15953b 100644 --- a/Userland/Libraries/LibGfx/Font/WOFF/Font.cpp +++ b/Userland/Libraries/LibGfx/Font/WOFF/Font.cpp @@ -120,7 +120,7 @@ ErrorOr> Font::try_load_from_externally_owned_memory(Readonl if (font_buffer_offset + orig_length > font_buffer.size()) return Error::from_string_literal("Uncompressed WOFF table too big"); if (comp_length < orig_length) { - auto decompressed = Compress::Zlib::decompress_all(buffer.slice(offset, comp_length)); + auto decompressed = Compress::ZlibDecompressor::decompress_all(buffer.slice(offset, comp_length)); if (!decompressed.has_value()) return Error::from_string_literal("Could not decompress WOFF table"); if (orig_length != decompressed->size()) diff --git a/Userland/Libraries/LibGfx/PNGLoader.cpp b/Userland/Libraries/LibGfx/PNGLoader.cpp index 42a00bcbea8..6c310ba03b1 100644 --- a/Userland/Libraries/LibGfx/PNGLoader.cpp +++ b/Userland/Libraries/LibGfx/PNGLoader.cpp @@ -706,7 +706,7 @@ static ErrorOr decode_png_bitmap(PNGLoadingContext& context) if (context.color_type == PNG::ColorType::IndexedColor && context.palette_data.is_empty()) return Error::from_string_literal("PNGImageDecoderPlugin: Didn't see a PLTE chunk for a palletized image, or it was empty."); - auto result = Compress::Zlib::decompress_all(context.compressed_data.span()); + auto result = Compress::ZlibDecompressor::decompress_all(context.compressed_data.span()); if (!result.has_value()) { context.state = PNGLoadingContext::State::Error; return Error::from_string_literal("PNGImageDecoderPlugin: Decompression failed"); diff --git a/Userland/Libraries/LibHTTP/Job.cpp b/Userland/Libraries/LibHTTP/Job.cpp index 66b1a8fcb12..920d9ccf2b4 100644 --- a/Userland/Libraries/LibHTTP/Job.cpp +++ b/Userland/Libraries/LibHTTP/Job.cpp @@ -51,12 +51,12 @@ static ErrorOr handle_content_encoding(ByteBuffer const& buf, Deprec // Even though the content encoding is "deflate", it's actually deflate with the zlib wrapper. // https://tools.ietf.org/html/rfc7230#section-4.2.2 - auto uncompressed = Compress::Zlib::decompress_all(buf); + auto uncompressed = Compress::ZlibDecompressor::decompress_all(buf); if (!uncompressed.has_value()) { // From the RFC: // "Note: Some non-conformant implementations send the "deflate" // compressed data without the zlib wrapper." - dbgln_if(JOB_DEBUG, "Job::handle_content_encoding: Zlib::decompress_all() failed. Trying DeflateDecompressor::decompress_all()"); + dbgln_if(JOB_DEBUG, "Job::handle_content_encoding: ZlibDecompressor::decompress_all() failed. Trying DeflateDecompressor::decompress_all()"); uncompressed = TRY(Compress::DeflateDecompressor::decompress_all(buf)); }