From 2a82f6e1e05b5791c264efd8f70a20aeadca7501 Mon Sep 17 00:00:00 2001
From: Jay Berkenbilt <ejb@ql.org>
Date: Fri, 22 Jun 2018 14:52:03 -0400
Subject: Add method to get count of objects in QPDF

---
 libqpdf/QPDF.cc | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

(limited to 'libqpdf')

diff --git a/libqpdf/QPDF.cc b/libqpdf/QPDF.cc
index 4dc1e5ca..7d3c10e7 100644
--- a/libqpdf/QPDF.cc
+++ b/libqpdf/QPDF.cc
@@ -1218,6 +1218,22 @@ QPDF::showXRefTable()
     }
 }
 
+size_t
+QPDF::getObjectCount()
+{
+    // This method returns the next available indirect object number.
+    // makeIndirectObject uses it for this purpose.
+    QPDFObjGen o1(0, 0);
+    if (! this->m->obj_cache.empty())
+    {
+	o1 = (*(this->m->obj_cache.rbegin())).first;
+    }
+    QPDFObjGen o2 = (*(this->m->xref_table.rbegin())).first;
+    QTC::TC("qpdf", "QPDF indirect last obj from xref",
+	    (o2.getObj() > o1.getObj()) ? 1 : 0);
+    return std::max(o1.getObj(), o2.getObj());
+}
+
 std::vector<QPDFObjectHandle>
 QPDF::getAllObjects()
 {
@@ -1904,15 +1920,7 @@ QPDF::resolveObjectsInStream(int obj_stream_number)
 QPDFObjectHandle
 QPDF::makeIndirectObject(QPDFObjectHandle oh)
 {
-    QPDFObjGen o1(0, 0);
-    if (! this->m->obj_cache.empty())
-    {
-	o1 = (*(this->m->obj_cache.rbegin())).first;
-    }
-    QPDFObjGen o2 = (*(this->m->xref_table.rbegin())).first;
-    QTC::TC("qpdf", "QPDF indirect last obj from xref",
-	    (o2.getObj() > o1.getObj()) ? 1 : 0);
-    int max_objid = std::max(o1.getObj(), o2.getObj());
+    int max_objid = getObjectCount();
     QPDFObjGen next(max_objid + 1, 0);
     this->m->obj_cache[next] =
 	ObjCache(QPDFObjectHandle::ObjAccessor::getObject(oh), -1, -1);
-- 
cgit v1.2.3-54-g00ecf