mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-09-10 11:36:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

LibPDF: Convert byte offsets to u64

Browse source 
This fixes a build failure on 32-bit.

Suggested-by: Nico Weber <thakis@chromium.org>
This commit is contained in:
Sergey Bugaev 2024-04-24 17:02:51 +03:00 • committed by Andrew Kaster
commit d458471e09
Notes: sideshowbarker 2024-07-17 02:23:25 +09:00
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Userland/Libraries/LibPDF/DocumentParser.cpp
View file

@ -477,7 +477,7 @@ PDFErrorOr<NonnullRefPtr<XRefTable>> DocumentParser::parse_xref_stream()
Vector<XRefEntry> entries; Vector<XRefEntry> entries;
for (int i = 0; i < count; i++) { for (int i = 0; i < count; i++) {
Array<long, 3> fields; Array<u64, 3> fields;
for (size_t field_index = 0; field_index < 3; ++field_index) { for (size_t field_index = 0; field_index < 3; ++field_index) {
if (!field_sizes->at(field_index).has_u32()) if (!field_sizes->at(field_index).has_u32())
return error("Malformed xref stream"); return error("Malformed xref stream");
@ -562,7 +562,7 @@ PDFErrorOr<NonnullRefPtr<XRefTable>> DocumentParser::parse_xref_table()
m_reader.move_by(2); m_reader.move_by(2);
} }
auto offset = strtol(offset_string.characters(), nullptr, 10); u64 offset = strtoll(offset_string.characters(), nullptr, 10);
auto generation = strtol(generation_string.characters(), nullptr, 10); auto generation = strtol(generation_string.characters(), nullptr, 10);
entries.append({ offset, static_cast<u16>(generation), letter == 'n' }); entries.append({ offset, static_cast<u16>(generation), letter == 'n' });

2
Userland/Libraries/LibPDF/Function.cpp
View file

@ -156,7 +156,7 @@ SampledFunction::create(Document* document, Vector<Bound> domain, Optional<Vecto
size_product *= size; size_product *= size;
size_t bits_per_plane = size_product * bits_per_sample; size_t bits_per_plane = size_product * bits_per_sample;
size_t total_bits = bits_per_plane * decode.size(); size_t total_bits = bits_per_plane * decode.size();
if (stream->bytes().size() < ceil_div(total_bits, 8ull)) if (stream->bytes().size() < ceil_div(total_bits, static_cast<size_t>(8)))
return Error { Error::Type::MalformedPDF, "Function type 0 stream too small" }; return Error { Error::Type::MalformedPDF, "Function type 0 stream too small" };
auto function = adopt_ref(*new SampledFunction(stream)); auto function = adopt_ref(*new SampledFunction(stream));

10
Userland/Libraries/LibPDF/XRefTable.h
View file

@ -14,10 +14,10 @@
namespace PDF { namespace PDF {
constexpr long invalid_byte_offset = NumericLimits<long>::max(); constexpr u64 invalid_byte_offset = NumericLimits<u64>::max();
struct XRefEntry { struct XRefEntry {
long byte_offset { invalid_byte_offset }; u64 byte_offset { invalid_byte_offset };
u16 generation_number { 0 }; u16 generation_number { 0 };
bool in_use { false }; bool in_use { false };
bool compressed { false }; bool compressed { false };
@ -73,16 +73,16 @@ public:
[[nodiscard]] ALWAYS_INLINE bool has_object(size_t index) const [[nodiscard]] ALWAYS_INLINE bool has_object(size_t index) const
{ {
return index < m_entries.size() && m_entries[index].byte_offset != -1; return index < m_entries.size() && m_entries[index].byte_offset != invalid_byte_offset;
} }
[[nodiscard]] ALWAYS_INLINE long byte_offset_for_object(size_t index) const [[nodiscard]] ALWAYS_INLINE u64 byte_offset_for_object(size_t index) const
{ {
VERIFY(has_object(index)); VERIFY(has_object(index));
return m_entries[index].byte_offset; return m_entries[index].byte_offset;
} }
[[nodiscard]] ALWAYS_INLINE long object_stream_for_object(size_t index) const [[nodiscard]] ALWAYS_INLINE u64 object_stream_for_object(size_t index) const
{ {
return byte_offset_for_object(index); return byte_offset_for_object(index);
} }