From 8ebddc1ff6e3112f41201371b9f83470726df866 Mon Sep 17 00:00:00 2001 From: Sergey Bugaev Date: Sun, 3 Sep 2023 23:25:27 +0300 Subject: [PATCH] LibGfx: Misc 32-bit build fixes --- Userland/Libraries/LibGfx/ImageFormats/ISOBMFF/Reader.cpp | 2 +- Userland/Libraries/LibGfx/ImageFormats/JPEGXLLoader.cpp | 2 +- Userland/Libraries/LibGfx/ImageFormats/WebPLoaderLossless.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Userland/Libraries/LibGfx/ImageFormats/ISOBMFF/Reader.cpp b/Userland/Libraries/LibGfx/ImageFormats/ISOBMFF/Reader.cpp index 231405af8c..9b383dc00e 100644 --- a/Userland/Libraries/LibGfx/ImageFormats/ISOBMFF/Reader.cpp +++ b/Userland/Libraries/LibGfx/ImageFormats/ISOBMFF/Reader.cpp @@ -19,7 +19,7 @@ ErrorOr Reader::read_entire_file() while (!m_stream->is_eof()) { auto box_header = TRY(read_box_header(*m_stream)); - BoxStream box_stream { *m_stream, box_header.contents_size }; + BoxStream box_stream { *m_stream, static_cast(box_header.contents_size) }; switch (box_header.type) { case BoxType::FileTypeBox: diff --git a/Userland/Libraries/LibGfx/ImageFormats/JPEGXLLoader.cpp b/Userland/Libraries/LibGfx/ImageFormats/JPEGXLLoader.cpp index 72883e87c6..72caef594a 100644 --- a/Userland/Libraries/LibGfx/ImageFormats/JPEGXLLoader.cpp +++ b/Userland/Libraries/LibGfx/ImageFormats/JPEGXLLoader.cpp @@ -1333,7 +1333,7 @@ private: auto const result = ((token << n | TRY(stream.read_bits(n))) << config.lsb_in_token) | low_bits; - VERIFY(result < (1ul << 32)); + VERIFY(result < (1ull << 32)); return result; } diff --git a/Userland/Libraries/LibGfx/ImageFormats/WebPLoaderLossless.cpp b/Userland/Libraries/LibGfx/ImageFormats/WebPLoaderLossless.cpp index 92ff7bffc8..ee1059841e 100644 --- a/Userland/Libraries/LibGfx/ImageFormats/WebPLoaderLossless.cpp +++ b/Userland/Libraries/LibGfx/ImageFormats/WebPLoaderLossless.cpp @@ -454,7 +454,7 @@ static ErrorOr> decode_webp_chunk_VP8L_image(ImageKind ima return Error::from_string_literal("WebPImageDecoderPlugin: Backward reference distance out of bounds"); } - if (end - pixel < length) { + if (end - pixel < static_cast(length)) { dbgln_if(WEBP_DEBUG, "invalid length, {} < {}", end - pixel, length); return Error::from_string_literal("WebPImageDecoderPlugin: Backward reference length out of bounds"); }