From 562ff1b6087a16a47ec5bc18fb765910541b1167 Mon Sep 17 00:00:00 2001 From: Jay Berkenbilt Date: Sun, 20 Nov 2022 16:04:58 -0500 Subject: Rename function for pikepdf (for 11.2.0) A new private overload of QPDF::makeIndirectObject breaks pikepdf's build, so renaming function. --- include/qpdf/QPDF.hh | 3 ++- 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 const&); - QPDFObjectHandle makeIndirectObject(std::shared_ptr const& obj); + QPDFObjectHandle + makeIndirectFromQPDFObject(std::shared_ptr 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 const& obj) +QPDF::makeIndirectFromQPDFObject(std::shared_ptr const& obj) { QPDFObjGen next{nextObjGen()}; m->obj_cache[next] = ObjCache(obj, -1, -1); @@ -2032,13 +2032,14 @@ QPDF::makeIndirectObject(std::shared_ptr 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)); } -- cgit v1.2.3-54-g00ecf