OpenSystemsDevelopment / qpdf

Commit 92d076ed7a6ec209fdfc3b92a86a510622d1330f

Authored by m-holger
1 parent e9e2eef5

Refactor `Pages::all`: inline common case, rename existing implementation to `ca… 

…che`, update calls, streamline initialization, and enhance assertion usage.
Inline Side-by-side
Showing 2 changed files with 14 additions and 10 deletions
libqpdf/QPDF_pages.cc
  View file @92d076e
... ... @@ -4,6 +4,7 @@
4 4 #include <qpdf/QPDFObjectHandle_private.hh>
5 5 #include <qpdf/QTC.hh>
6 6 #include <qpdf/QUtil.hh>
  7 +#include <qpdf/Util.hh>
7 8  
8 9 // In support of page manipulation APIs, these methods internally maintain state about pages in a
9 10 // pair of data structures: all_pages, which is a vector of page objects, and pageobj_to_pages_pos,
... ... @@ -46,7 +47,7 @@ QPDF::getAllPages()
46 47 }
47 48  
48 49 std::vector<QPDFObjectHandle> const&
49   -Pages::all()
  50 +Pages::cache()
50 51 {
51 52 // Note that pushInheritedAttributesToPage may also be used to initialize m->all_pages.
52 53 if (all_pages.empty() && !invalid_page_found) {
... ... @@ -253,7 +254,7 @@ Pages::update_cache()
253 254 all_pages.clear();
254 255 pageobj_to_pages_pos.clear();
255 256 pushed_inherited_attributes_to_pages = false;
256   - all();
  257 + cache();
257 258 }
258 259  
259 260 void
... ... @@ -309,9 +310,9 @@ Pages::pushInheritedAttributesToPage(bool allow_changes, bool warn_skipped_keys)
309 310 return;
310 311 }
311 312  
312   - // Calling getAllPages() resolves any duplicated page objects, repairs broken nodes, and detects
  313 + // Calling cache() resolves any duplicated page objects, repairs broken nodes, and detects
313 314 // loops, so we don't have to do those activities here.
314   - (void)all();
  315 + (void)cache();
315 316  
316 317 // key_ancestors is a mapping of page attribute keys to a stack of Pages nodes that contain
317 318 // values for them.
... ... @@ -321,10 +322,9 @@ Pages::pushInheritedAttributesToPage(bool allow_changes, bool warn_skipped_keys)
321 322 key_ancestors,
322 323 allow_changes,
323 324 warn_skipped_keys);
324   - if (!key_ancestors.empty()) {
325   - throw std::logic_error(
326   - "key_ancestors not empty after pushing inherited attributes to pages");
327   - }
  325 + util::assertion(
  326 + key_ancestors.empty(),
  327 + "key_ancestors not empty after pushing inherited attributes to pages");
328 328 pushed_inherited_attributes_to_pages = true;
329 329 ever_pushed_inherited_attributes_to_pages_ = true;
330 330 }
... ...
libqpdf/qpdf/QPDF_private.hh
  View file @92d076e
... ... @@ -865,7 +865,11 @@ class QPDF::Doc::Pages: Common
865 865 {
866 866 }
867 867  
868   - std::vector<QPDFObjectHandle> const& all();
  868 + std::vector<QPDFObjectHandle> const&
  869 + all()
  870 + {
  871 + return !all_pages.empty() ? all_pages : cache();
  872 + }
869 873  
870 874 bool
871 875 empty()
... ... @@ -906,7 +910,7 @@ class QPDF::Doc::Pages: Common
906 910 std::map<std::string, std::vector<QPDFObjectHandle>>&,
907 911 bool allow_changes,
908 912 bool warn_skipped_keys);
909   -
  913 + std::vector<QPDFObjectHandle> const& cache();
910 914 void getAllPagesInternal(
911 915 QPDFObjectHandle cur_pages,
912 916 QPDFObjGen::set& visited,
... ...