diff options
author | Jay Berkenbilt <ejb@ql.org> | 2021-01-16 18:11:17 +0100 |
---|---|---|
committer | Jay Berkenbilt <ejb@ql.org> | 2021-01-24 09:22:59 +0100 |
commit | 5f0708418a0a9cbacc033f52efc11c759120fd09 (patch) | |
tree | 272e5d97b37b6c6d65653ad04d8dc768ef18041d /qpdf/test_driver.cc | |
parent | 4a1cce0a470e6deed6dbeb6093e4e5c16f53439d (diff) | |
download | qpdf-5f0708418a0a9cbacc033f52efc11c759120fd09.tar.zst |
Add iterators to name/number tree helpers
Diffstat (limited to 'qpdf/test_driver.cc')
-rw-r--r-- | qpdf/test_driver.cc | 31 |
1 files changed, 21 insertions, 10 deletions
diff --git a/qpdf/test_driver.cc b/qpdf/test_driver.cc index 1be7fbaf..0a55f3ce 100644 --- a/qpdf/test_driver.cc +++ b/qpdf/test_driver.cc @@ -1749,13 +1749,17 @@ void runtest(int n, char const* filename1, char const* arg2) // number-tree.pdf QPDFObjectHandle qtest = pdf.getTrailer().getKey("/QTest"); QPDFNumberTreeObjectHelper ntoh(qtest); + for (auto iter: ntoh) + { + std::cout << iter.first << " " + << iter.second.getStringValue() + << std::endl; + } QPDFNumberTreeObjectHelper::idx_map ntoh_map = ntoh.getAsMap(); - for (QPDFNumberTreeObjectHelper::idx_map::iterator iter = - ntoh_map.begin(); - iter != ntoh_map.end(); ++iter) + for (auto& iter: ntoh_map) { - std::cout << (*iter).first << " " - << (*iter).second.getStringValue() + std::cout << iter.first << " " + << iter.second.getStringValue() << std::endl; } assert(1 == ntoh.getMin()); @@ -1793,13 +1797,17 @@ void runtest(int n, char const* filename1, char const* arg2) // name-tree.pdf QPDFObjectHandle qtest = pdf.getTrailer().getKey("/QTest"); QPDFNameTreeObjectHelper ntoh(qtest); + for (auto iter: ntoh) + { + std::cout << iter.first << " -> " + << iter.second.getStringValue() + << std::endl; + } std::map<std::string, QPDFObjectHandle> ntoh_map = ntoh.getAsMap(); - for (std::map<std::string, QPDFObjectHandle>::iterator iter = - ntoh_map.begin(); - iter != ntoh_map.end(); ++iter) + for (auto& iter: ntoh_map) { - std::cout << (*iter).first << " -> " - << (*iter).second.getStringValue() + std::cout << iter.first << " -> " + << iter.second.getStringValue() << std::endl; } assert(ntoh.hasName("11 elephant")); @@ -1809,6 +1817,9 @@ void runtest(int n, char const* filename1, char const* arg2) assert(! ntoh.findObject("potato", oh)); assert(ntoh.findObject("07 sev\xe2\x80\xa2n", oh)); assert("seven!" == oh.getStringValue()); + auto last = ntoh.last(); + assert((*last).first == "29 twenty-nine"); + assert((*last).second.getUTF8Value() == "twenty-nine!"); } else if (n == 49) { |