diff options
| author | m-holger <m-holger@kubitscheck.org> | 2022-08-02 18:18:00 +0200 |
|---|---|---|
| committer | m-holger <m-holger@kubitscheck.org> | 2022-08-31 23:46:55 +0200 |
| commit | 16841bec32bb4323a60699cf42f0d74ef495b73f (patch) | |
| tree | 37fe4b74f22f3d7b3793864fedb55b937ffe0728 /libqpdf | |
| parent | 07b66eb0b688072d408c8eb51eaa1025c4ca4d7d (diff) | |
| download | qpdf-16841bec32bb4323a60699cf42f0d74ef495b73f.tar.zst | |
Remove QPDFObjectHandle::makeReserved
Diffstat (limited to 'libqpdf')
| -rw-r--r-- | libqpdf/QPDF.cc | 5 | ||||
| -rw-r--r-- | libqpdf/QPDFObjectHandle.cc | 12 |
2 files changed, 4 insertions, 13 deletions
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 |