OpenSystemsDevelopment / qpdf

Commit 9689f4cdcff33babafad71378fb26259f0556a99

Authored by Jay Berkenbilt
1 parent 11d33a45

Use getRoot() instead of looking it up in the trailer

Inline Side-by-side
Showing 1 changed file with 4 additions and 5 deletions
libqpdf/QPDF_pages.cc
  View file @9689f4c
@@ -45,8 +45,7 @@ QPDF::getAllPages() @@ -45,8 +45,7 @@ QPDF::getAllPages()
45 { 45 {
46 if (this->all_pages.empty()) 46 if (this->all_pages.empty())
47 { 47 {
48 - getAllPagesInternal(  
49 - this->trailer.getKey("/Root").getKey("/Pages"), this->all_pages); 48 + getAllPagesInternal(getRoot().getKey("/Pages"), this->all_pages);
50 } 49 }
51 return this->all_pages; 50 return this->all_pages;
52 } 51 }
@@ -106,7 +105,7 @@ QPDF::flattenPagesTree() @@ -106,7 +105,7 @@ QPDF::flattenPagesTree()
106 optimizePagesTree(true); 105 optimizePagesTree(true);
107 getAllPages(); 106 getAllPages();
108 107
109 - QPDFObjectHandle pages = this->trailer.getKey("/Root").getKey("/Pages"); 108 + QPDFObjectHandle pages = getRoot().getKey("/Pages");
110 109
111 int const len = (int)this->all_pages.size(); 110 int const len = (int)this->all_pages.size();
112 for (int pos = 0; pos < len; ++pos) 111 for (int pos = 0; pos < len; ++pos)
@@ -170,7 +169,7 @@ QPDF::insertPage(QPDFObjectHandle newpage, int pos) @@ -170,7 +169,7 @@ QPDF::insertPage(QPDFObjectHandle newpage, int pos)
170 (pos == ((int)this->all_pages.size())) ? 1 : // insert at end 169 (pos == ((int)this->all_pages.size())) ? 1 : // insert at end
171 2); // insert in middle 170 2); // insert in middle
172 171
173 - QPDFObjectHandle pages = this->trailer.getKey("/Root").getKey("/Pages"); 172 + QPDFObjectHandle pages = getRoot().getKey("/Pages");
174 QPDFObjectHandle kids = pages.getKey("/Kids"); 173 QPDFObjectHandle kids = pages.getKey("/Kids");
175 assert ((pos >= 0) && (pos <= (int)this->all_pages.size())); 174 assert ((pos >= 0) && (pos <= (int)this->all_pages.size()));
176 175
@@ -197,7 +196,7 @@ QPDF::removePage(QPDFObjectHandle page) @@ -197,7 +196,7 @@ QPDF::removePage(QPDFObjectHandle page)
197 (pos == ((int)this->all_pages.size() - 1)) ? 1 : // remove at end 196 (pos == ((int)this->all_pages.size() - 1)) ? 1 : // remove at end
198 2); // remove in middle 197 2); // remove in middle
199 198
200 - QPDFObjectHandle pages = this->trailer.getKey("/Root").getKey("/Pages"); 199 + QPDFObjectHandle pages = getRoot().getKey("/Pages");
201 QPDFObjectHandle kids = pages.getKey("/Kids"); 200 QPDFObjectHandle kids = pages.getKey("/Kids");
202 201
203 kids.eraseItem(pos); 202 kids.eraseItem(pos);