octoleo/qpdf
2
1
Fork 0
mirror of https://github.com/qpdf/qpdf.git synced 2025-01-03 15:17:29 +00:00
Code Issues Releases Wiki Activity

Remove QPDFObjectHandle::makeReserved

Browse Source
This commit is contained in:
m-holger 2022-08-02 17:18:00 +01:00
parent 07b66eb0b6
commit 16841bec32
3 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/qpdf/QPDFObjectHandle.hh
View File

@ -1458,12 +1458,6 @@ class QPDFObjectHandle
return QPDFObjectHandle::newStream( return QPDFObjectHandle::newStream(
qpdf, og, stream_dict, offset, length); qpdf, og, stream_dict, offset, length);
} }
// Reserve an object with a specific ID
static QPDFObjectHandle
makeReserved()
{
return QPDFObjectHandle::makeReserved();
}
}; };
friend class Factory; friend class Factory;
@ -1574,7 +1568,6 @@ class QPDFObjectHandle
QPDFObjectHandle stream_dict, QPDFObjectHandle stream_dict,
qpdf_offset_t offset, qpdf_offset_t offset,
size_t length); size_t length);
static QPDFObjectHandle makeReserved();
void typeWarning(char const* expected_type, std::string const& warning); void typeWarning(char const* expected_type, std::string const& warning);
void objectWarning(std::string const& warning); void objectWarning(std::string const& warning);

5
libqpdf/QPDF.cc
View File

@ -24,6 +24,7 @@
#include <qpdf/QPDF_Array.hh> #include <qpdf/QPDF_Array.hh>
#include <qpdf/QPDF_Dictionary.hh> #include <qpdf/QPDF_Dictionary.hh>
#include <qpdf/QPDF_Null.hh> #include <qpdf/QPDF_Null.hh>
#include <qpdf/QPDF_Reserved.hh>
#include <qpdf/QPDF_Stream.hh> #include <qpdf/QPDF_Stream.hh>
#include <qpdf/QTC.hh> #include <qpdf/QTC.hh>
#include <qpdf/QUtil.hh> #include <qpdf/QUtil.hh>
@ -2144,9 +2145,9 @@ QPDF::makeIndirectObject(QPDFObjectHandle oh)
QPDFObjectHandle QPDFObjectHandle
QPDF::reserveObjectIfNotExists(QPDFObjGen const& og) 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); resolve(og);
replaceObject(og, QPDFObjectHandle::Factory::makeReserved()); m->obj_cache[og].object = QPDF_Reserved::create();
} }
return getObject(og); return getObject(og);
} }

12
libqpdf/QPDFObjectHandle.cc
View File

@ -2152,17 +2152,7 @@ QPDFObjectHandle::newStream(QPDF* qpdf, std::string const& data)
QPDFObjectHandle QPDFObjectHandle
QPDFObjectHandle::newReserved(QPDF* qpdf) QPDFObjectHandle::newReserved(QPDF* qpdf)
{ {
// Reserve a spot for this object by assigning it an object return qpdf->makeIndirectObject(QPDFObjectHandle(QPDF_Reserved::create()));
// 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());
} }
void void