Commit 4ccca20db0f507ad5a5d71711d5e03d3a6a2f3a2
1 parent
a9c0b026
Remove redundant parameter from QPDF::getAllPagesInternal
Showing
2 changed files
with
3 additions
and
5 deletions
include/qpdf/QPDF.hh
| @@ -1230,7 +1230,6 @@ class QPDF | @@ -1230,7 +1230,6 @@ class QPDF | ||
| 1230 | 1230 | ||
| 1231 | void getAllPagesInternal( | 1231 | void getAllPagesInternal( |
| 1232 | QPDFObjectHandle cur_pages, | 1232 | QPDFObjectHandle cur_pages, |
| 1233 | - std::vector<QPDFObjectHandle>& result, | ||
| 1234 | std::set<QPDFObjGen>& visited, | 1233 | std::set<QPDFObjGen>& visited, |
| 1235 | std::set<QPDFObjGen>& seen); | 1234 | std::set<QPDFObjGen>& seen); |
| 1236 | void insertPage(QPDFObjectHandle newpage, int pos); | 1235 | void insertPage(QPDFObjectHandle newpage, int pos); |
libqpdf/QPDF_pages.cc
| @@ -82,7 +82,7 @@ QPDF::getAllPages() | @@ -82,7 +82,7 @@ QPDF::getAllPages() | ||
| 82 | getRoot().replaceKey("/Pages", pages); | 82 | getRoot().replaceKey("/Pages", pages); |
| 83 | } | 83 | } |
| 84 | seen.clear(); | 84 | seen.clear(); |
| 85 | - getAllPagesInternal(pages, this->m->all_pages, visited, seen); | 85 | + getAllPagesInternal(pages, visited, seen); |
| 86 | } | 86 | } |
| 87 | return this->m->all_pages; | 87 | return this->m->all_pages; |
| 88 | } | 88 | } |
| @@ -90,7 +90,6 @@ QPDF::getAllPages() | @@ -90,7 +90,6 @@ QPDF::getAllPages() | ||
| 90 | void | 90 | void |
| 91 | QPDF::getAllPagesInternal( | 91 | QPDF::getAllPagesInternal( |
| 92 | QPDFObjectHandle cur_node, | 92 | QPDFObjectHandle cur_node, |
| 93 | - std::vector<QPDFObjectHandle>& result, | ||
| 94 | std::set<QPDFObjGen>& visited, | 93 | std::set<QPDFObjGen>& visited, |
| 95 | std::set<QPDFObjGen>& seen) | 94 | std::set<QPDFObjGen>& seen) |
| 96 | { | 95 | { |
| @@ -129,12 +128,12 @@ QPDF::getAllPagesInternal( | @@ -129,12 +128,12 @@ QPDF::getAllPagesInternal( | ||
| 129 | kid = makeIndirectObject(QPDFObjectHandle(kid).shallowCopy()); | 128 | kid = makeIndirectObject(QPDFObjectHandle(kid).shallowCopy()); |
| 130 | kids.setArrayItem(i, kid); | 129 | kids.setArrayItem(i, kid); |
| 131 | } | 130 | } |
| 132 | - getAllPagesInternal(kid, result, visited, seen); | 131 | + getAllPagesInternal(kid, visited, seen); |
| 133 | } | 132 | } |
| 134 | } else { | 133 | } else { |
| 135 | wanted_type = "/Page"; | 134 | wanted_type = "/Page"; |
| 136 | seen.insert(this_og); | 135 | seen.insert(this_og); |
| 137 | - result.push_back(cur_node); | 136 | + m->all_pages.push_back(cur_node); |
| 138 | } | 137 | } |
| 139 | 138 | ||
| 140 | if (!cur_node.isDictionaryOfType(wanted_type)) { | 139 | if (!cur_node.isDictionaryOfType(wanted_type)) { |