From 16841bec32bb4323a60699cf42f0d74ef495b73f Mon Sep 17 00:00:00 2001
From: m-holger <m-holger@kubitscheck.org>
Date: Tue, 2 Aug 2022 17:18:00 +0100
Subject: Remove QPDFObjectHandle::makeReserved

---
 include/qpdf/QPDFObjectHandle.hh |  7 -------
 libqpdf/QPDF.cc                  |  5 +++--
 libqpdf/QPDFObjectHandle.cc      | 12 +-----------
 3 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/include/qpdf/QPDFObjectHandle.hh b/include/qpdf/QPDFObjectHandle.hh
index eeccebf2..beb69421 100644
--- a/include/qpdf/QPDFObjectHandle.hh
+++ b/include/qpdf/QPDFObjectHandle.hh
@@ -1458,12 +1458,6 @@ class QPDFObjectHandle
             return QPDFObjectHandle::newStream(
                 qpdf, og, stream_dict, offset, length);
         }
-        // Reserve an object with a specific ID
-        static QPDFObjectHandle
-        makeReserved()
-        {
-            return QPDFObjectHandle::makeReserved();
-        }
     };
     friend class Factory;
 
@@ -1574,7 +1568,6 @@ class QPDFObjectHandle
         QPDFObjectHandle stream_dict,
         qpdf_offset_t offset,
         size_t length);
-    static QPDFObjectHandle makeReserved();
 
     void typeWarning(char const* expected_type, std::string const& warning);
     void objectWarning(std::string const& warning);
diff --git a/libqpdf/QPDF.cc b/libqpdf/QPDF.cc
index c39e2456..7b357b13 100644
--- a/libqpdf/QPDF.cc
+++ b/libqpdf/QPDF.cc
@@ -24,6 +24,7 @@
 #include <qpdf/QPDF_Array.hh>
 #include <qpdf/QPDF_Dictionary.hh>
 #include <qpdf/QPDF_Null.hh>
+#include <qpdf/QPDF_Reserved.hh>
 #include <qpdf/QPDF_Stream.hh>
 #include <qpdf/QTC.hh>
 #include <qpdf/QUtil.hh>
@@ -2144,9 +2145,9 @@ QPDF::makeIndirectObject(QPDFObjectHandle oh)
 QPDFObjectHandle
 QPDF::reserveObjectIfNotExists(QPDFObjGen const& og)
 {
-    if ((!this->m->obj_cache.count(og)) && (!this->m->xref_table.count(og))) {
+    if ((!m->obj_cache.count(og)) && (!m->xref_table.count(og))) {
         resolve(og);
-        replaceObject(og, QPDFObjectHandle::Factory::makeReserved());
+        m->obj_cache[og].object = QPDF_Reserved::create();
     }
     return getObject(og);
 }
diff --git a/libqpdf/QPDFObjectHandle.cc b/libqpdf/QPDFObjectHandle.cc
index 5874186e..8c98c87b 100644
--- a/libqpdf/QPDFObjectHandle.cc
+++ b/libqpdf/QPDFObjectHandle.cc
@@ -2152,17 +2152,7 @@ QPDFObjectHandle::newStream(QPDF* qpdf, std::string const& data)
 QPDFObjectHandle
 QPDFObjectHandle::newReserved(QPDF* qpdf)
 {
-    // Reserve a spot for this object by assigning it an object
-    // number, but then return an unresolved handle to the object.
-    QPDFObjectHandle reserved = qpdf->makeIndirectObject(makeReserved());
-    QPDFObjectHandle result = newIndirect(qpdf, reserved.getObjGen());
-    return result;
-}
-
-QPDFObjectHandle
-QPDFObjectHandle::makeReserved()
-{
-    return QPDFObjectHandle(QPDF_Reserved::create());
+    return qpdf->makeIndirectObject(QPDFObjectHandle(QPDF_Reserved::create()));
 }
 
 void
-- 
cgit v1.2.3-54-g00ecf