From 8cba8ed25a0347f35eeefd2acff9b25d025b1fba Mon Sep 17 00:00:00 2001 From: Lucas CHOLLET Date: Sat, 29 Apr 2023 20:29:55 -0400 Subject: [PATCH] LibGfx/JPEG: Rename `HuffmanTableSpec` => `HuffmanTable` --- .../Libraries/LibGfx/ImageFormats/JPEGLoader.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Userland/Libraries/LibGfx/ImageFormats/JPEGLoader.cpp b/Userland/Libraries/LibGfx/ImageFormats/JPEGLoader.cpp index bc97b97a44..be3a0f45b7 100644 --- a/Userland/Libraries/LibGfx/ImageFormats/JPEGLoader.cpp +++ b/Userland/Libraries/LibGfx/ImageFormats/JPEGLoader.cpp @@ -180,7 +180,7 @@ struct StartOfFrame { u16 width { 0 }; }; -struct HuffmanTableSpec { +struct HuffmanTable { u8 type { 0 }; u8 destination_id { 0 }; u8 code_counts[16] = { 0 }; @@ -227,7 +227,7 @@ public: VERIFY_NOT_REACHED(); } - ErrorOr next_symbol(HuffmanTableSpec const& table) + ErrorOr next_symbol(HuffmanTable const& table) { u16 const code = peek_bits(16); u64 code_cursor = 0; @@ -366,8 +366,8 @@ struct JPEGLoadingContext { Vector components; RefPtr bitmap; u16 dc_restart_interval { 0 }; - HashMap dc_tables; - HashMap ac_tables; + HashMap dc_tables; + HashMap ac_tables; Array previous_dc_values {}; MacroblockMeta mblock_meta; OwnPtr stream; @@ -378,7 +378,7 @@ struct JPEGLoadingContext { Optional icc_data; }; -static void generate_huffman_codes(HuffmanTableSpec& table) +static void generate_huffman_codes(HuffmanTable& table) { unsigned code = 0; for (auto number_of_codes : table.code_counts) { @@ -867,7 +867,7 @@ static ErrorOr read_huffman_table(Stream& stream, JPEGLoadingContext& cont u16 bytes_to_read = TRY(read_effective_chunk_size(stream)); while (bytes_to_read > 0) { - HuffmanTableSpec table; + HuffmanTable table; u8 table_info = TRY(stream.read_value()); u8 table_type = table_info >> 4; u8 table_destination_id = table_info & 0x0F;