diff options
| author | m-holger <m-holger@kubitscheck.org> | 2023-05-18 16:18:39 +0200 |
|---|---|---|
| committer | m-holger <m-holger@kubitscheck.org> | 2023-05-19 19:56:17 +0200 |
| commit | 50bc82b4e035853bd06a9935722d6b5aec902133 (patch) | |
| tree | a6ee9fa2e76dd16411cd0214ed2ddd83b124ed24 | |
| parent | 9db2965f628640e8ed19797a5fc8a31172cb6e7d (diff) | |
| download | qpdf-50bc82b4e035853bd06a9935722d6b5aec902133.tar.zst | |
Tidy QPDFJob::doJSONObjects
| -rw-r--r-- | libqpdf/QPDFJob.cc | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/libqpdf/QPDFJob.cc b/libqpdf/QPDFJob.cc index 37dbf3fe..f76d0acb 100644 --- a/libqpdf/QPDFJob.cc +++ b/libqpdf/QPDFJob.cc @@ -1043,7 +1043,7 @@ QPDFJob::doJSONObjects(Pipeline* p, bool& first, QPDF& pdf) bool first_object = true; JSON::writeDictionaryOpen(p, first_object, 1); bool all_objects = m->json_objects.empty(); - std::set<QPDFObjGen> wanted_og = getWantedJSONObjects(); + auto wanted_og = getWantedJSONObjects(); for (auto& obj: pdf.getAllObjects()) { std::string key = obj.unparse(); if (this->m->json_version > 1) { @@ -1063,11 +1063,8 @@ QPDFJob::doJSONObjects(Pipeline* p, bool& first, QPDF& pdf) if (this->m->json_objects.count("trailer")) { json_objects.insert("trailer"); } - auto wanted = getWantedJSONObjects(); - for (auto const& og: wanted) { - std::ostringstream s; - s << "obj:" << og.unparse(' ') << " R"; - json_objects.insert(s.str()); + for (auto og: getWantedJSONObjects()) { + json_objects.emplace("obj:" + og.unparse(' ') + " R"); } pdf.writeJSON( this->m->json_version, @@ -1088,7 +1085,7 @@ QPDFJob::doJSONObjectinfo(Pipeline* p, bool& first, QPDF& pdf) bool first_object = true; JSON::writeDictionaryOpen(p, first_object, 1); bool all_objects = m->json_objects.empty(); - std::set<QPDFObjGen> wanted_og = getWantedJSONObjects(); + auto wanted_og = getWantedJSONObjects(); for (auto& obj: pdf.getAllObjects()) { if (all_objects || wanted_og.count(obj.getObjGen())) { auto j_details = JSON::makeDictionary(); |