From 13641693cbbca1869a12fd445d2364c7e89bf082 Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Mon, 18 Dec 2023 21:31:27 -0500 Subject: [PATCH] LibPDF: Use make_object<>() to make objects No behavior change. --- Tests/LibPDF/TestPDF.cpp | 6 +++--- Userland/Libraries/LibPDF/Document.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Tests/LibPDF/TestPDF.cpp b/Tests/LibPDF/TestPDF.cpp index 450e8d7176..b5e99815be 100644 --- a/Tests/LibPDF/TestPDF.cpp +++ b/Tests/LibPDF/TestPDF.cpp @@ -113,7 +113,7 @@ static PDF::Value make_array(Vector floats) Vector values; for (auto f : floats) values.append(PDF::Value { f }); - return PDF::Value { adopt_ref(*new PDF::ArrayObject(move(values))) }; + return PDF::Value { make_object(move(values)) }; } static PDF::PDFErrorOr> make_function(int type, ReadonlyBytes data, Vector domain, Vector range, Function&)> extra_keys = nullptr) @@ -124,8 +124,8 @@ static PDF::PDFErrorOr> make_function(int type, Rea map.set(PDF::CommonNames::Range, make_array(move(range))); if (extra_keys) extra_keys(map); - auto dict = adopt_ref(*new PDF::DictObject(move(map))); - auto stream = adopt_ref(*new PDF::StreamObject(dict, MUST(ByteBuffer::copy(data)))); + auto dict = make_object(move(map)); + auto stream = make_object(dict, MUST(ByteBuffer::copy(data))); // document isn't used for anything, but UBSan complains about a (harmless) method call on a null object without it. auto file = MUST(Core::MappedFile::map("linearized.pdf"sv)); diff --git a/Userland/Libraries/LibPDF/Document.cpp b/Userland/Libraries/LibPDF/Document.cpp index 9137cb0fe4..38a6aedcbc 100644 --- a/Userland/Libraries/LibPDF/Document.cpp +++ b/Userland/Libraries/LibPDF/Document.cpp @@ -235,7 +235,7 @@ PDFErrorOr Document::get_page(u32 index) if (maybe_resources_object.has_value()) resources = maybe_resources_object.value()->cast(); else - resources = adopt_ref(*new DictObject({})); + resources = make_object(HashMap {}); RefPtr contents; if (raw_page_object->contains(CommonNames::Contents))