RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 15:37:46 +00:00
Code Issues Activity Actions

LibPDF: Store indirect value refs in Value objects

Browse source 
IndirectValueRef is so simple that it can be stored directly in the
Value class instead of being heap allocated.

As the comment in Value says, however, in theory the max bits needed to
store is 48 (16 for the generation index and 32(?) for the object
index), but 32 should be good enough for now. We can increase it to u64
later if necessary.
This commit is contained in:
Matthew Olsson 2021-05-23 16:12:25 -07:00 • committed by Ali Mohammad Pur
parent 534a2e95d2
commit be6e4b6f3c
7 changed files with 56 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Userland/Libraries/LibPDF/Document.cpp
View file

@ -101,20 +101,18 @@ Page Document::get_page(u32 index)
Value Document::resolve(const Value& value)
{
if (value.is_ref()) {
// FIXME: Surely indirect PDF objects can't contain another indirect PDF object,
// right? Unsure from the spec, but if they can, these return values would have
// to be wrapped with another resolve() call.
return get_or_load_value(value.as_ref_index());
}
if (!value.is_object())
return value;
auto obj = value.as_object();
// FIXME: Surely indirect PDF objects can't contain another indirect PDF object,
// right? Unsure from the spec, but if they can, these return values would have
// to be wrapped with another resolve() call.
if (obj->is_indirect_value_ref()) {
auto object_index = static_cast<NonnullRefPtr<IndirectValueRef>>(obj)->index();
return get_or_load_value(object_index);
}
if (obj->is_indirect_value())
return static_cast<NonnullRefPtr<IndirectValue>>(obj)->value();
@ -137,13 +135,13 @@ void Document::add_page_tree_node_to_page_tree(NonnullRefPtr<DictObject> page_tr
// these pages to the overall page tree
for (auto& value : *kids_array) {
auto reference = object_cast<IndirectValueRef>(value.as_object());
auto byte_offset = m_xref_table.byte_offset_for_object(reference->index());
auto reference_index = value.as_ref_index();
auto byte_offset = m_xref_table.byte_offset_for_object(reference_index);
auto maybe_page_tree_node = m_parser.conditionally_parse_page_tree_node_at_offset(byte_offset);
if (maybe_page_tree_node) {
add_page_tree_node_to_page_tree(maybe_page_tree_node.release_nonnull());
} else {
m_page_object_indices.append(reference->index());
m_page_object_indices.append(reference_index);
}
}
@ -151,10 +149,8 @@ void Document::add_page_tree_node_to_page_tree(NonnullRefPtr<DictObject> page_tr
}
// We know all of the kids are leaf nodes
for (auto& value : *kids_array) {
auto reference = object_cast<IndirectValueRef>(value.as_object());
m_page_object_indices.append(reference->index());
}
for (auto& value : *kids_array)
m_page_object_indices.append(value.as_ref_index());
}
}