diff --git a/Libraries/LibGfx/BMPLoader.cpp b/Libraries/LibGfx/BMPLoader.cpp index 2a9dde5ff0..d1e75f819a 100644 --- a/Libraries/LibGfx/BMPLoader.cpp +++ b/Libraries/LibGfx/BMPLoader.cpp @@ -186,12 +186,12 @@ RefPtr load_bmp(const StringView& path) return bitmap; } -const LogStream& operator<<(const LogStream& out, Endpoint ep) +static const LogStream& operator<<(const LogStream& out, Endpoint ep) { return out << "(" << ep.x << ", " << ep.y << ", " << ep.z << ")"; } -const LogStream& operator<<(const LogStream& out, Endpoint ep) +static const LogStream& operator<<(const LogStream& out, Endpoint ep) { return out << "(" << ep.x << ", " << ep.y << ", " << ep.z << ")"; } @@ -254,7 +254,7 @@ private: }; // Lookup table for distributing all possible 2-bit numbers evenly into 8-bit numbers -u8 scaling_factors_2bit[4] = { +static u8 scaling_factors_2bit[4] = { 0x00, 0x55, 0xaa, @@ -262,7 +262,7 @@ u8 scaling_factors_2bit[4] = { }; // Lookup table for distributing all possible 3-bit numbers evenly into 8-bit numbers -u8 scaling_factors_3bit[8] = { +static u8 scaling_factors_3bit[8] = { 0x00, 0x24, 0x48, @@ -273,7 +273,7 @@ u8 scaling_factors_3bit[8] = { 0xff, }; -u8 scale_masked_8bit_number(u8 number, u8 bits_set) +static u8 scale_masked_8bit_number(u8 number, u8 bits_set) { // If there are more than 4 bit set, an easy way to scale the number is to // just copy the most significant bits into the least significant bits @@ -288,7 +288,7 @@ u8 scale_masked_8bit_number(u8 number, u8 bits_set) return scaling_factors_3bit[number >> 5]; } -u8 get_scaled_color(u32 data, u8 mask_size, i8 mask_shift) +static u8 get_scaled_color(u32 data, u8 mask_size, i8 mask_shift) { // A negative mask_shift indicates we actually need to left shift // the result in order to get out a valid 8-bit color (for example, the blue @@ -307,7 +307,7 @@ u8 get_scaled_color(u32 data, u8 mask_size, i8 mask_shift) // consider, as an example, a 5 bit number (so the bottom 3 bits are ignored). // The purest white you could get is 0xf8, which is 248 in RGB-land. We need // to scale the values in order to reach the proper value of 255. -u32 int_to_scaled_rgb(BMPLoadingContext& context, u32 data) +static u32 int_to_scaled_rgb(BMPLoadingContext& context, u32 data) { u8 r = get_scaled_color(data & context.dib.info.masks[0], context.dib.info.mask_sizes[0], context.dib.info.mask_shifts[0]); u8 g = get_scaled_color(data & context.dib.info.masks[1], context.dib.info.mask_sizes[1], context.dib.info.mask_shifts[1]); @@ -325,7 +325,7 @@ u32 int_to_scaled_rgb(BMPLoadingContext& context, u32 data) return color; } -void populate_dib_mask_info(BMPLoadingContext& context) +static void populate_dib_mask_info(BMPLoadingContext& context) { if (context.dib.info.masks.is_empty()) return; @@ -592,7 +592,7 @@ static bool decode_bmp_osv2_dib(BMPLoadingContext& context, Streamer& streamer, return true; } -ALWAYS_INLINE bool is_supported_compression_format(BMPLoadingContext& context, u8 compression) +ALWAYS_INLINE static bool is_supported_compression_format(BMPLoadingContext& context, u8 compression) { return compression == Compression::RGB || compression == Compression::BITFIELDS || compression == Compression::ALPHABITFIELDS || compression == Compression::RLE8 diff --git a/Libraries/LibGfx/GIFLoader.cpp b/Libraries/LibGfx/GIFLoader.cpp index 5a3d1032ca..8304c97b7c 100644 --- a/Libraries/LibGfx/GIFLoader.cpp +++ b/Libraries/LibGfx/GIFLoader.cpp @@ -36,8 +36,6 @@ namespace Gfx { -static bool load_gif_frame_descriptors(GIFLoadingContext&); - struct RGB { u8 r; u8 g; @@ -117,7 +115,7 @@ enum class GIFFormat { GIF89a, }; -Optional decode_gif_header(BufferStream& stream) +static Optional decode_gif_header(BufferStream& stream) { static const char valid_header_87[] = "GIF87a"; static const char valid_header_89[] = "GIF89a"; @@ -262,7 +260,7 @@ private: Vector m_output {}; }; -bool decode_frames_up_to_index(GIFLoadingContext& context, size_t frame_index) +static bool decode_frames_up_to_index(GIFLoadingContext& context, size_t frame_index) { if (frame_index >= context.images.size()) { return false; @@ -340,7 +338,7 @@ bool decode_frames_up_to_index(GIFLoadingContext& context, size_t frame_index) return true; } -bool load_gif_frame_descriptors(GIFLoadingContext& context) +static bool load_gif_frame_descriptors(GIFLoadingContext& context) { if (context.data_size < 32) return false; diff --git a/Libraries/LibGfx/JPGLoader.cpp b/Libraries/LibGfx/JPGLoader.cpp index f21d8de793..ca0715127f 100644 --- a/Libraries/LibGfx/JPGLoader.cpp +++ b/Libraries/LibGfx/JPGLoader.cpp @@ -220,7 +220,7 @@ struct JPGLoadingContext { MacroblockMeta mblock_meta; }; -void generate_huffman_codes(HuffmanTableSpec& table) +static void generate_huffman_codes(HuffmanTableSpec& table) { unsigned code = 0; for (auto number_of_codes : table.code_counts) { @@ -230,7 +230,7 @@ void generate_huffman_codes(HuffmanTableSpec& table) } } -Optional read_huffman_bits(HuffmanStreamState& hstream, size_t count = 1) +static Optional read_huffman_bits(HuffmanStreamState& hstream, size_t count = 1) { if (count > (8 * sizeof(size_t))) { dbg() << String::format("Can't read %i bits at once!", count); @@ -254,7 +254,7 @@ Optional read_huffman_bits(HuffmanStreamState& hstream, size_t count = 1 return value; } -Optional get_next_symbol(HuffmanStreamState& hstream, const HuffmanTableSpec& table) +static Optional get_next_symbol(HuffmanStreamState& hstream, const HuffmanTableSpec& table) { unsigned code = 0; size_t code_cursor = 0; @@ -289,7 +289,7 @@ Optional get_next_symbol(HuffmanStreamState& hstream, const HuffmanTableSpec * macroblocks that share the chrominance data. Next two iterations (assuming that * we are dealing with three components) will fill up the blocks with chroma data. */ -bool build_macroblocks(JPGLoadingContext& context, Vector& macroblocks, u8 hcursor, u8 vcursor) +static bool build_macroblocks(JPGLoadingContext& context, Vector& macroblocks, u8 hcursor, u8 vcursor) { for (u32 cindex = 0; cindex < context.component_count; cindex++) { auto& component = context.components[cindex]; @@ -373,7 +373,7 @@ bool build_macroblocks(JPGLoadingContext& context, Vector& macrobloc return true; } -Optional> decode_huffman_stream(JPGLoadingContext& context) +static Optional> decode_huffman_stream(JPGLoadingContext& context) { Vector macroblocks; macroblocks.resize(context.mblock_meta.padded_total); @@ -798,7 +798,7 @@ static bool skip_marker_with_length(BufferStream& stream) return !stream.handle_read_failure(); } -void dequantize(JPGLoadingContext& context, Vector& macroblocks) +static void dequantize(JPGLoadingContext& context, Vector& macroblocks) { for (u32 vcursor = 0; vcursor < context.mblock_meta.vcount; vcursor += context.vsample_factor) { for (u32 hcursor = 0; hcursor < context.mblock_meta.hcount; hcursor += context.hsample_factor) { @@ -819,7 +819,7 @@ void dequantize(JPGLoadingContext& context, Vector& macroblocks) } } -void inverse_dct(const JPGLoadingContext& context, Vector& macroblocks) +static void inverse_dct(const JPGLoadingContext& context, Vector& macroblocks) { static const float m0 = 2.0 * cos(1.0 / 16.0 * 2.0 * M_PI); static const float m1 = 2.0 * cos(2.0 / 16.0 * 2.0 * M_PI); @@ -986,7 +986,7 @@ void inverse_dct(const JPGLoadingContext& context, Vector& macrobloc } } -void ycbcr_to_rgb(const JPGLoadingContext& context, Vector& macroblocks) +static void ycbcr_to_rgb(const JPGLoadingContext& context, Vector& macroblocks) { for (u32 vcursor = 0; vcursor < context.mblock_meta.vcount; vcursor += context.vsample_factor) { for (u32 hcursor = 0; hcursor < context.mblock_meta.hcount; hcursor += context.hsample_factor) {