mirror of
https://github.com/RGBCube/serenity
synced 2025-07-25 20:37:35 +00:00
LibPDF: Break weird dependency cycle
Old situation: Object.h defines Object Object.h defines ArrayObject ArrayObject requires the definition of Object ArrayObject requires the definition of Value Value.h defines Value Value requires the definition of Object Therefore, a file with the single line "#include <Value.h>" used to raise compilation errors; certainly not something that one might expect from a library. This patch splits up the definitions in Object.h to break the cycle. Now, Object.h only defines Object, Value.h still only defines Value (and includes Object.h), and the new header ObjectDerivatives.h defines ArrayObject (and includes both Object.h and Value.h).
This commit is contained in:
parent
7ddd11729d
commit
edc0cd29f8
8 changed files with 218 additions and 200 deletions
135
Userland/Libraries/LibPDF/ObjectDerivatives.cpp
Normal file
135
Userland/Libraries/LibPDF/ObjectDerivatives.cpp
Normal file
|
@ -0,0 +1,135 @@
|
|||
/*
|
||||
* Copyright (c) 2021, Matthew Olsson <mattco@serenityos.org>
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-2-Clause
|
||||
*/
|
||||
|
||||
#include <AK/Hex.h>
|
||||
#include <LibPDF/Document.h>
|
||||
#include <LibPDF/ObjectDerivatives.h>
|
||||
|
||||
namespace PDF {
|
||||
|
||||
NonnullRefPtr<Object> ArrayObject::get_object_at(Document* document, size_t index) const
|
||||
{
|
||||
return document->resolve_to<Object>(m_elements[index]);
|
||||
}
|
||||
|
||||
NonnullRefPtr<Object> DictObject::get_object(Document* document, FlyString const& key) const
|
||||
{
|
||||
return document->resolve_to<Object>(get_value(key));
|
||||
}
|
||||
|
||||
#define DEFINE_ACCESSORS(class_name, snake_name) \
|
||||
NonnullRefPtr<class_name> ArrayObject::get_##snake_name##_at(Document* document, size_t index) const \
|
||||
{ \
|
||||
return document->resolve_to<class_name>(m_elements[index]); \
|
||||
} \
|
||||
\
|
||||
NonnullRefPtr<class_name> DictObject::get_##snake_name(Document* document, FlyString const& key) const \
|
||||
{ \
|
||||
return document->resolve_to<class_name>(get(key).value()); \
|
||||
}
|
||||
ENUMERATE_OBJECT_TYPES(DEFINE_ACCESSORS)
|
||||
#undef DEFINE_INDEXER
|
||||
|
||||
static void append_indent(StringBuilder& builder, int indent)
|
||||
{
|
||||
for (int i = 0; i < indent; i++)
|
||||
builder.append(" ");
|
||||
}
|
||||
|
||||
String StringObject::to_string(int) const
|
||||
{
|
||||
if (is_binary())
|
||||
return String::formatted("<{}>", encode_hex(string().bytes()).to_uppercase());
|
||||
return String::formatted("({})", string());
|
||||
}
|
||||
|
||||
String NameObject::to_string(int) const
|
||||
{
|
||||
StringBuilder builder;
|
||||
builder.appendff("/{}", this->name());
|
||||
return builder.to_string();
|
||||
}
|
||||
|
||||
String ArrayObject::to_string(int indent) const
|
||||
{
|
||||
StringBuilder builder;
|
||||
builder.append("[\n");
|
||||
bool first = true;
|
||||
|
||||
for (auto& element : elements()) {
|
||||
if (!first)
|
||||
builder.append(",\n");
|
||||
first = false;
|
||||
append_indent(builder, indent + 1);
|
||||
builder.appendff("{}", element.to_string(indent));
|
||||
}
|
||||
|
||||
builder.append('\n');
|
||||
append_indent(builder, indent);
|
||||
builder.append(']');
|
||||
return builder.to_string();
|
||||
}
|
||||
|
||||
String DictObject::to_string(int indent) const
|
||||
{
|
||||
StringBuilder builder;
|
||||
builder.append("<<\n");
|
||||
bool first = true;
|
||||
|
||||
for (auto& [key, value] : map()) {
|
||||
if (!first)
|
||||
builder.append(",\n");
|
||||
first = false;
|
||||
append_indent(builder, indent + 1);
|
||||
builder.appendff("/{} ", key);
|
||||
builder.appendff("{}", value.to_string(indent + 1));
|
||||
}
|
||||
|
||||
builder.append('\n');
|
||||
append_indent(builder, indent);
|
||||
builder.append(">>");
|
||||
return builder.to_string();
|
||||
}
|
||||
|
||||
String StreamObject::to_string(int indent) const
|
||||
{
|
||||
StringBuilder builder;
|
||||
builder.append("stream\n");
|
||||
append_indent(builder, indent);
|
||||
builder.appendff("{}\n", dict()->to_string(indent + 1));
|
||||
append_indent(builder, indent + 1);
|
||||
|
||||
auto string = encode_hex(bytes());
|
||||
while (true) {
|
||||
if (string.length() > 60) {
|
||||
builder.appendff("{}\n", string.substring(0, 60));
|
||||
append_indent(builder, indent);
|
||||
string = string.substring(60);
|
||||
continue;
|
||||
}
|
||||
|
||||
builder.appendff("{}\n", string);
|
||||
break;
|
||||
}
|
||||
|
||||
append_indent(builder, indent);
|
||||
builder.append("endstream");
|
||||
return builder.to_string();
|
||||
}
|
||||
|
||||
String IndirectValue::to_string(int indent) const
|
||||
{
|
||||
StringBuilder builder;
|
||||
builder.appendff("{} {} obj\n", index(), generation_index());
|
||||
append_indent(builder, indent + 1);
|
||||
builder.append(value().to_string(indent + 1));
|
||||
builder.append('\n');
|
||||
append_indent(builder, indent);
|
||||
builder.append("endobj");
|
||||
return builder.to_string();
|
||||
}
|
||||
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue