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

LibCompress: Move CanonicalCode out of DeflateDecompressor.

Browse source
This commit is contained in:
asynts 2020-09-10 14:06:50 +02:00 • committed by Andreas Kling
parent 49e6ff8958
commit 5c9c0082a1
2 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Libraries/LibCompress/Deflate.cpp
View file

@ -34,7 +34,7 @@
namespace Compress { namespace Compress {
const DeflateDecompressor::CanonicalCode& DeflateDecompressor::CanonicalCode::fixed_literal_codes() const CanonicalCode& CanonicalCode::fixed_literal_codes()
{ {
static CanonicalCode code; static CanonicalCode code;
static bool initialized = false; static bool initialized = false;
@ -54,7 +54,7 @@ const DeflateDecompressor::CanonicalCode& DeflateDecompressor::CanonicalCode::fi
return code; return code;
} }
const DeflateDecompressor::CanonicalCode& DeflateDecompressor::CanonicalCode::fixed_distance_codes() const CanonicalCode& CanonicalCode::fixed_distance_codes()
{ {
static CanonicalCode code; static CanonicalCode code;
static bool initialized = false; static bool initialized = false;
@ -71,7 +71,7 @@ const DeflateDecompressor::CanonicalCode& DeflateDecompressor::CanonicalCode::fi
return code; return code;
} }
Optional<DeflateDecompressor::CanonicalCode> DeflateDecompressor::CanonicalCode::from_bytes(ReadonlyBytes bytes) Optional<CanonicalCode> CanonicalCode::from_bytes(ReadonlyBytes bytes)
{ {
// FIXME: I can't quite follow the algorithm here, but it seems to work. // FIXME: I can't quite follow the algorithm here, but it seems to work.
@ -103,7 +103,7 @@ Optional<DeflateDecompressor::CanonicalCode> DeflateDecompressor::CanonicalCode:
return code; return code;
} }
u32 DeflateDecompressor::CanonicalCode::read_symbol(InputBitStream& stream) const u32 CanonicalCode::read_symbol(InputBitStream& stream) const
{ {
u32 code_bits = 1; u32 code_bits = 1;

30
Libraries/LibCompress/Deflate.h
View file

@ -34,23 +34,23 @@
namespace Compress { namespace Compress {
class CanonicalCode {
public:
CanonicalCode() = default;
u32 read_symbol(InputBitStream&) const;
static const CanonicalCode& fixed_literal_codes();
static const CanonicalCode& fixed_distance_codes();
static Optional<CanonicalCode> from_bytes(ReadonlyBytes);
private:
Vector<u32> m_symbol_codes;
Vector<u32> m_symbol_values;
};
class DeflateDecompressor final : public InputStream { class DeflateDecompressor final : public InputStream {
private: private:
class CanonicalCode {
public:
CanonicalCode() = default;
u32 read_symbol(InputBitStream&) const;
static const CanonicalCode& fixed_literal_codes();
static const CanonicalCode& fixed_distance_codes();
static Optional<CanonicalCode> from_bytes(ReadonlyBytes);
private:
Vector<u32> m_symbol_codes;
Vector<u32> m_symbol_values;
};
class CompressedBlock { class CompressedBlock {
public: public:
CompressedBlock(DeflateDecompressor&, CanonicalCode literal_codes, Optional<CanonicalCode> distance_codes); CompressedBlock(DeflateDecompressor&, CanonicalCode literal_codes, Optional<CanonicalCode> distance_codes);