octoleo/qpdf
2
1
Fork 0
mirror of https://github.com/qpdf/qpdf.git synced 2024-12-22 10:58:58 +00:00
Code Issues Releases Wiki Activity

Rename function for pikepdf (for 11.2.0)

Browse Source 
A new private overload of QPDF::makeIndirectObject breaks pikepdf's
build, so renaming function.
This commit is contained in:
Jay Berkenbilt 2022-11-20 16:04:58 -05:00
parent a63e164412
commit 562ff1b608
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/qpdf/QPDF.hh
View File

@ -1219,7 +1219,8 @@ class QPDF
QPDFObjGen nextObjGen(); QPDFObjGen nextObjGen();
QPDFObjectHandle QPDFObjectHandle
newIndirect(QPDFObjGen const&, std::shared_ptr<QPDFObject> const&); 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 isCached(QPDFObjGen const& og);
bool isUnresolved(QPDFObjGen const& og); bool isUnresolved(QPDFObjGen const& og);
void updateCache( void updateCache(

7
libqpdf/QPDF.cc
View File

@ -2022,7 +2022,7 @@ QPDF::nextObjGen()
} }
QPDFObjectHandle QPDFObjectHandle
QPDF::makeIndirectObject(std::shared_ptr<QPDFObject> const& obj) QPDF::makeIndirectFromQPDFObject(std::shared_ptr<QPDFObject> const& obj)
{ {
QPDFObjGen next{nextObjGen()}; QPDFObjGen next{nextObjGen()};
m->obj_cache[next] = ObjCache(obj, -1, -1); m->obj_cache[next] = ObjCache(obj, -1, -1);
@ -2032,13 +2032,14 @@ QPDF::makeIndirectObject(std::shared_ptr<QPDFObject> const& obj)
QPDFObjectHandle QPDFObjectHandle
QPDF::makeIndirectObject(QPDFObjectHandle oh) QPDF::makeIndirectObject(QPDFObjectHandle oh)
{ {
return makeIndirectObject(QPDFObjectHandle::ObjAccessor::getObject(oh)); return makeIndirectFromQPDFObject(
QPDFObjectHandle::ObjAccessor::getObject(oh));
} }
QPDFObjectHandle QPDFObjectHandle
QPDF::newStream() QPDF::newStream()
{ {
return makeIndirectObject(QPDF_Stream::create( return makeIndirectFromQPDFObject(QPDF_Stream::create(
this, nextObjGen(), QPDFObjectHandle::newDictionary(), 0, 0)); this, nextObjGen(), QPDFObjectHandle::newDictionary(), 0, 0));
} }