Refactor `Pages` methods: add `erase`, `find` and `update_cache`, refactor `QPDF…

…::removePage` to use `Pages::erase`, streamline cache handling in `Pages::update_cache`.

Refactor `Pages` methods: add `erase`, `find` and `update_cache`, refactor `QPDF…
…::removePage` to use `Pages::erase`, streamline cache handling in `Pages::update_cache`.
m-holger
1 parent fc27221a
Showing 2 changed files with 31 additions and 8 deletions
libqpdf/QPDF_pages.cc
libqpdf/qpdf/QPDF_private.hh
@@ -241,13 +241,19 @@ Pages::getAllPagesInternal(
 void
 QPDF::updateAllPagesCache()
 {
+    m->pages.update_cache();
+}
+
+void
+Pages::update_cache()
+{
     // Force regeneration of the pages cache.  We force immediate recalculation of all_pages since
     // users may have references to it that they got from calls to getAllPages().  We can defer
     // recalculation of pageobj_to_pages_pos until needed.
     m->all_pages.clear();
     m->pageobj_to_pages_pos.clear();
     m->pushed_inherited_attributes_to_pages = false;
-    getAllPages();
+    all();
 }
 void
@@ -274,11 +280,11 @@ Pages::flattenPagesTree()
         m->all_pages.at(pos).replaceKey("/Parent", pages);
     }
-    pages.replaceKey("/Kids", QPDFObjectHandle::newArray(m->all_pages));
+    pages.replaceKey("/Kids", Array(m->all_pages));
     // /Count has not changed
     if (pages.getKey("/Count").getUIntValue() != len) {
         if (m->invalid_page_found && pages.getKey("/Count").getUIntValue() > len) {
-            pages.replaceKey("/Count", QPDFObjectHandle::newInteger(toI(len)));
+            pages.replaceKey("/Count", Integer(len));
         } else {
             throw std::runtime_error("/Count is wrong after flattening pages tree");
         }
@@ -484,7 +490,13 @@ Pages::insertPage(QPDFObjectHandle newpage, int pos)
 void
 QPDF::removePage(QPDFObjectHandle page)
 {
-    int pos = findPage(page); // also ensures flat /Pages
+    m->pages.erase(page);
+}
+
+void
+Pages ::erase(QPDFObjectHandle& page)
+{
+    int pos = qpdf.findPage(page); // also ensures flat /Pages
     QTC::TC(
         "qpdf",
         "QPDF remove page",
@@ -492,7 +504,7 @@ QPDF::removePage(QPDFObjectHandle page)
             (pos == toI(m->all_pages.size() - 1)) ? 1   // end
                                                   : 2); // remove in middle
-    QPDFObjectHandle pages = getRoot().getKey("/Pages");
+    QPDFObjectHandle pages = qpdf.getRoot().getKey("/Pages");
     QPDFObjectHandle kids = pages.getKey("/Kids");
     kids.eraseItem(pos);
@@ -535,7 +547,13 @@ QPDF::findPage(QPDFObjectHandle&amp; page)
 int
 QPDF::findPage(QPDFObjGen og)
 {
-    m->pages.flattenPagesTree();
+    return m->pages.find(og);
+}
+
+int
+Pages ::find(QPDFObjGen og)
+{
+    flattenPagesTree();
     auto it = m->pageobj_to_pages_pos.find(og);
     if (it == m->pageobj_to_pages_pos.end()) {
         throw QPDFExc(
@@ -879,17 +879,22 @@ class QPDF::Doc::Pages: Common
         return all().size();
     }
+    int find(QPDFObjGen og);
+    void erase(QPDFObjectHandle& page);
+    void update_cache();
+
     void insertPage(QPDFObjectHandle newpage, int pos);
+    void pushInheritedAttributesToPage(bool allow_changes, bool warn_skipped_keys);
+
+  private:
     void flattenPagesTree();
     void insertPageobjToPage(QPDFObjectHandle const& obj, int pos, bool check_duplicate);
-    void pushInheritedAttributesToPage(bool allow_changes, bool warn_skipped_keys);
     void pushInheritedAttributesToPageInternal(
         QPDFObjectHandle,
         std::map<std::string, std::vector<QPDFObjectHandle>>&,
         bool allow_changes,
         bool warn_skipped_keys);
-  private:
     void getAllPagesInternal(
         QPDFObjectHandle cur_pages,
         QPDFObjGen::set& visited,