diff options
| author | Thorsten Schöning <6223655+ams-tschoening@users.noreply.github.com> | 2019-07-03 19:34:02 +0200 |
|---|---|---|
| committer | Jay Berkenbilt <ejb@ql.org> | 2019-07-04 02:08:47 +0200 |
| commit | 8f06da75343a5e970ff7a6f275c319172e6292d0 (patch) | |
| tree | 13782f4c3cdc2966cfab5e4dbd064c3ff52dbaba /qpdf | |
| parent | 4db1de97cea9dfab3f3abe43766053ba0d594610 (diff) | |
| download | qpdf-8f06da75343a5e970ff7a6f275c319172e6292d0.tar.zst | |
Change list to vector for outline helpers (fixes #297)
This change works around STL problems with Embarcadero C++ Builder
version 10.2, but std::vector is more common than std::list in qpdf,
and this is a relatively new API, so an API change is tolerable.
Thanks to Thorsten Schöning <6223655+ams-tschoening@users.noreply.github.com>
for the fix.
Diffstat (limited to 'qpdf')
| -rw-r--r-- | qpdf/qpdf.cc | 8 | ||||
| -rw-r--r-- | qpdf/test_driver.cc | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/qpdf/qpdf.cc b/qpdf/qpdf.cc index da37ac25..a0f7f7ea 100644 --- a/qpdf/qpdf.cc +++ b/qpdf/qpdf.cc @@ -3493,9 +3493,9 @@ static void do_json_pages(QPDF& pdf, Options& o, JSON& j) "label", pldh.getLabelForPage(pageno).getJSON()); JSON j_outlines = j_page.addDictionaryMember( "outlines", JSON::makeArray()); - std::list<QPDFOutlineObjectHelper> outlines = + std::vector<QPDFOutlineObjectHelper> outlines = odh.getOutlinesForPage(page.getObjGen()); - for (std::list<QPDFOutlineObjectHelper>::iterator oiter = + for (std::vector<QPDFOutlineObjectHelper>::iterator oiter = outlines.begin(); oiter != outlines.end(); ++oiter) { @@ -3543,10 +3543,10 @@ static void do_json_page_labels(QPDF& pdf, Options& o, JSON& j) } static void add_outlines_to_json( - std::list<QPDFOutlineObjectHelper> outlines, JSON& j, + std::vector<QPDFOutlineObjectHelper> outlines, JSON& j, std::map<QPDFObjGen, int>& page_numbers) { - for (std::list<QPDFOutlineObjectHelper>::iterator iter = outlines.begin(); + for (std::vector<QPDFOutlineObjectHelper>::iterator iter = outlines.begin(); iter != outlines.end(); ++iter) { QPDFOutlineObjectHelper& ol = *iter; diff --git a/qpdf/test_driver.cc b/qpdf/test_driver.cc index 7aed39ba..c6ddd715 100644 --- a/qpdf/test_driver.cc +++ b/qpdf/test_driver.cc @@ -1805,9 +1805,9 @@ void runtest(int n, char const* filename1, char const* arg2) for (std::vector<QPDFPageObjectHelper>::iterator iter = pages.begin(); iter != pages.end(); ++iter, ++pageno) { - std::list<QPDFOutlineObjectHelper> outlines = + std::vector<QPDFOutlineObjectHelper> outlines = odh.getOutlinesForPage((*iter).getObjectHandle().getObjGen()); - for (std::list<QPDFOutlineObjectHelper>::iterator oiter = + for (std::vector<QPDFOutlineObjectHelper>::iterator oiter = outlines.begin(); oiter != outlines.end(); ++oiter) { |