diff options
| author | Jay Berkenbilt <ejb@ql.org> | 2022-11-20 22:04:58 +0100 |
|---|---|---|
| committer | Jay Berkenbilt <ejb@ql.org> | 2022-11-20 22:04:58 +0100 |
| commit | 562ff1b6087a16a47ec5bc18fb765910541b1167 (patch) | |
| tree | 7c73b41b8366c67b8aa99cd2d78bc306ad708875 | |
| parent | a63e164412a11df89e202c76b4fd110320edcea4 (diff) | |
| download | qpdf-11.2.tar.zst | |
A new private overload of QPDF::makeIndirectObject breaks pikepdf's
build, so renaming function.
| -rw-r--r-- | include/qpdf/QPDF.hh | 3 | ||||
| -rw-r--r-- | libqpdf/QPDF.cc | 7 |
2 files changed, 6 insertions, 4 deletions
diff --git a/include/qpdf/QPDF.hh b/include/qpdf/QPDF.hh index 987b78aa..eb3bf2e2 100644 --- a/include/qpdf/QPDF.hh +++ b/include/qpdf/QPDF.hh @@ -1219,7 +1219,8 @@ class QPDF QPDFObjGen nextObjGen(); QPDFObjectHandle newIndirect(QPDFObjGen const&, std::shared_ptr<QPDFObject> const&); - QPDFObjectHandle makeIndirectObject(std::shared_ptr<QPDFObject> const& obj); + QPDFObjectHandle + makeIndirectFromQPDFObject(std::shared_ptr<QPDFObject> const& obj); bool isCached(QPDFObjGen const& og); bool isUnresolved(QPDFObjGen const& og); void updateCache( diff --git a/libqpdf/QPDF.cc b/libqpdf/QPDF.cc index 0000f050..7446c6da 100644 --- a/libqpdf/QPDF.cc +++ b/libqpdf/QPDF.cc @@ -2022,7 +2022,7 @@ QPDF::nextObjGen() } QPDFObjectHandle -QPDF::makeIndirectObject(std::shared_ptr<QPDFObject> const& obj) +QPDF::makeIndirectFromQPDFObject(std::shared_ptr<QPDFObject> const& obj) { QPDFObjGen next{nextObjGen()}; m->obj_cache[next] = ObjCache(obj, -1, -1); @@ -2032,13 +2032,14 @@ QPDF::makeIndirectObject(std::shared_ptr<QPDFObject> const& obj) QPDFObjectHandle QPDF::makeIndirectObject(QPDFObjectHandle oh) { - return makeIndirectObject(QPDFObjectHandle::ObjAccessor::getObject(oh)); + return makeIndirectFromQPDFObject( + QPDFObjectHandle::ObjAccessor::getObject(oh)); } QPDFObjectHandle QPDF::newStream() { - return makeIndirectObject(QPDF_Stream::create( + return makeIndirectFromQPDFObject(QPDF_Stream::create( this, nextObjGen(), QPDFObjectHandle::newDictionary(), 0, 0)); } |