diff options
| author | m-holger <m-holger@kubitscheck.org> | 2022-07-23 15:45:54 +0200 |
|---|---|---|
| committer | m-holger <m-holger@kubitscheck.org> | 2022-07-24 16:59:49 +0200 |
| commit | 3404ca8ac8e19ccba5ff2d7426081a593880f1c0 (patch) | |
| tree | 5caf86915093bb85e690222994a447465737de47 /libqpdf/QPDF.cc | |
| parent | b123f79dfd5015453bdbf5d53f8225d73b6b20aa (diff) | |
| download | qpdf-3404ca8ac8e19ccba5ff2d7426081a593880f1c0.tar.zst | |
QPDFObjGen : tidy QPDFObjectHandle private methods
Change method signature to use QPDFObjGen.
Diffstat (limited to 'libqpdf/QPDF.cc')
| -rw-r--r-- | libqpdf/QPDF.cc | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/libqpdf/QPDF.cc b/libqpdf/QPDF.cc index 5397da4f..97303471 100644 --- a/libqpdf/QPDF.cc +++ b/libqpdf/QPDF.cc @@ -1404,9 +1404,8 @@ QPDF::fixDanglingReferences(bool force) // For each non-scalar item to process, put it in the queue. std::list<QPDFObjectHandle> queue; queue.push_back(this->m->trailer); - for (auto const& iter: to_process) { - QPDFObjectHandle obj = QPDFObjectHandle::Factory::newIndirect( - this, iter.getObj(), iter.getGen()); + for (auto const& og: to_process) { + QPDFObjectHandle obj = QPDFObjectHandle::Factory::newIndirect(this, og); if (obj.isDictionary() || obj.isArray()) { queue.push_back(obj); } else if (obj.isStream()) { @@ -1472,10 +1471,7 @@ QPDF::getAllObjects() std::vector<QPDFObjectHandle> result; for (auto const& iter: this->m->obj_cache) { QPDFObjGen const& og = iter.first; - result.push_back( - // line-break - QPDFObjectHandle::Factory::newIndirect( - this, og.getObj(), og.getGen())); + result.push_back(QPDFObjectHandle::Factory::newIndirect(this, og)); } return result; } @@ -1662,7 +1658,11 @@ QPDF::readObject( } } object = QPDFObjectHandle::Factory::newStream( - this, objid, generation, object, stream_offset, length); + this, + QPDFObjGen(objid, generation), + object, + stream_offset, + length); } else { input->seek(cur_offset, SEEK_SET); } @@ -2159,8 +2159,7 @@ QPDF::makeIndirectObject(QPDFObjectHandle oh) QPDFObjGen next(max_objid + 1, 0); this->m->obj_cache[next] = ObjCache(QPDFObjectHandle::ObjAccessor::getObject(oh), -1, -1); - return QPDFObjectHandle::Factory::newIndirect( - this, next.getObj(), next.getGen()); + return QPDFObjectHandle::Factory::newIndirect(this, next); } QPDFObjectHandle @@ -2178,19 +2177,19 @@ QPDFObjectHandle QPDF::reserveStream(int objid, int gen) { return QPDFObjectHandle::Factory::newStream( - this, objid, gen, QPDFObjectHandle::newDictionary(), 0, 0); + this, QPDFObjGen(objid, gen), QPDFObjectHandle::newDictionary(), 0, 0); } QPDFObjectHandle QPDF::getObjectByObjGen(QPDFObjGen const& og) { - return getObjectByID(og.getObj(), og.getGen()); + return QPDFObjectHandle::Factory::newIndirect(this, og); } QPDFObjectHandle QPDF::getObjectByID(int objid, int generation) { - return QPDFObjectHandle::Factory::newIndirect(this, objid, generation); + return getObjectByObjGen(QPDFObjGen(objid, generation)); } void |