mirrors/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity.git synced 2025-01-24 10:22:05 -05:00
Code Issues Projects Releases Packages Wiki Activity

LibCompress: Make LzmaHeader a POD-like type

Browse source 
This allows us to initialize the struct using an aggregate initializer.
This commit is contained in:
Tim Schumacher 2023-05-01 13:38:04 +02:00 • committed by Andreas Kling
parent 440d8f908f
commit 4a37bac374
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Userland/Libraries/LibCompress/Lzma.cpp
View file

@ -13,10 +13,10 @@ u32 LzmaHeader::dictionary_size() const
// "If the value of dictionary size in properties is smaller than (1 << 12),
// the LZMA decoder must set the dictionary size variable to (1 << 12)."
constexpr u32 minimum_dictionary_size = (1 << 12);
if (m_dictionary_size < minimum_dictionary_size)
if (unchecked_dictionary_size < minimum_dictionary_size)
return minimum_dictionary_size;
return m_dictionary_size;
return unchecked_dictionary_size;
}
Optional<u64> LzmaHeader::uncompressed_size() const
@ -24,7 +24,7 @@ Optional<u64> LzmaHeader::uncompressed_size() const
// We are making a copy of the packed field here because we would otherwise
// pass an unaligned reference to the constructor of Optional, which is
// undefined behavior.
auto uncompressed_size = m_uncompressed_size;
auto uncompressed_size = encoded_uncompressed_size;
// "If "Uncompressed size" field contains ones in all 64 bits, it means that
// uncompressed size is unknown and there is the "end marker" in stream,
@ -73,7 +73,7 @@ ErrorOr<LzmaModelProperties> LzmaHeader::decode_model_properties(u8 input_bits)
ErrorOr<LzmaDecompressorOptions> LzmaHeader::as_decompressor_options() const
{
auto model_properties = TRY(decode_model_properties(m_encoded_model_properties));
auto model_properties = TRY(decode_model_properties(encoded_model_properties));
return Compress::LzmaDecompressorOptions {
.literal_context_bits = model_properties.literal_context_bits,

7
Userland/Libraries/LibCompress/Lzma.h
View file

@ -41,10 +41,9 @@ struct [[gnu::packed]] LzmaHeader {
static ErrorOr<LzmaModelProperties> decode_model_properties(u8 input_bits);
private:
u8 m_encoded_model_properties;
u32 m_dictionary_size;
u64 m_uncompressed_size;
u8 encoded_model_properties;
u32 unchecked_dictionary_size;
u64 encoded_uncompressed_size;
};
static_assert(sizeof(LzmaHeader) == 13);