Commit 562ff1b6087a16a47ec5bc18fb765910541b1167

Authored by Jay Berkenbilt
1 parent a63e1644

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
@@ -1219,7 +1219,8 @@ class QPDF @@ -1219,7 +1219,8 @@ class QPDF
1219 QPDFObjGen nextObjGen(); 1219 QPDFObjGen nextObjGen();
1220 QPDFObjectHandle 1220 QPDFObjectHandle
1221 newIndirect(QPDFObjGen const&, std::shared_ptr<QPDFObject> const&); 1221 newIndirect(QPDFObjGen const&, std::shared_ptr<QPDFObject> const&);
1222 - QPDFObjectHandle makeIndirectObject(std::shared_ptr<QPDFObject> const& obj); 1222 + QPDFObjectHandle
  1223 + makeIndirectFromQPDFObject(std::shared_ptr<QPDFObject> const& obj);
1223 bool isCached(QPDFObjGen const& og); 1224 bool isCached(QPDFObjGen const& og);
1224 bool isUnresolved(QPDFObjGen const& og); 1225 bool isUnresolved(QPDFObjGen const& og);
1225 void updateCache( 1226 void updateCache(
libqpdf/QPDF.cc
@@ -2022,7 +2022,7 @@ QPDF::nextObjGen() @@ -2022,7 +2022,7 @@ QPDF::nextObjGen()
2022 } 2022 }
2023 2023
2024 QPDFObjectHandle 2024 QPDFObjectHandle
2025 -QPDF::makeIndirectObject(std::shared_ptr<QPDFObject> const& obj) 2025 +QPDF::makeIndirectFromQPDFObject(std::shared_ptr<QPDFObject> const& obj)
2026 { 2026 {
2027 QPDFObjGen next{nextObjGen()}; 2027 QPDFObjGen next{nextObjGen()};
2028 m->obj_cache[next] = ObjCache(obj, -1, -1); 2028 m->obj_cache[next] = ObjCache(obj, -1, -1);
@@ -2032,13 +2032,14 @@ QPDF::makeIndirectObject(std::shared_ptr&lt;QPDFObject&gt; const&amp; obj) @@ -2032,13 +2032,14 @@ QPDF::makeIndirectObject(std::shared_ptr&lt;QPDFObject&gt; const&amp; obj)
2032 QPDFObjectHandle 2032 QPDFObjectHandle
2033 QPDF::makeIndirectObject(QPDFObjectHandle oh) 2033 QPDF::makeIndirectObject(QPDFObjectHandle oh)
2034 { 2034 {
2035 - return makeIndirectObject(QPDFObjectHandle::ObjAccessor::getObject(oh)); 2035 + return makeIndirectFromQPDFObject(
  2036 + QPDFObjectHandle::ObjAccessor::getObject(oh));
2036 } 2037 }
2037 2038
2038 QPDFObjectHandle 2039 QPDFObjectHandle
2039 QPDF::newStream() 2040 QPDF::newStream()
2040 { 2041 {
2041 - return makeIndirectObject(QPDF_Stream::create( 2042 + return makeIndirectFromQPDFObject(QPDF_Stream::create(
2042 this, nextObjGen(), QPDFObjectHandle::newDictionary(), 0, 0)); 2043 this, nextObjGen(), QPDFObjectHandle::newDictionary(), 0, 0));
2043 } 2044 }
2044 2045