From 9db2965f628640e8ed19797a5fc8a31172cb6e7d Mon Sep 17 00:00:00 2001 From: m-holger Date: Thu, 18 May 2023 14:42:27 +0100 Subject: [PATCH] Use QPDFObjGen::set in QPDFJob::getWantedJSONObjects --- include/qpdf/QPDFJob.hh | 2 +- libqpdf/QPDFJob.cc | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/include/qpdf/QPDFJob.hh b/include/qpdf/QPDFJob.hh index 2a82d61c..63c888e6 100644 --- a/include/qpdf/QPDFJob.hh +++ b/include/qpdf/QPDFJob.hh @@ -571,7 +571,7 @@ class QPDFJob // JSON void doJSON(QPDF& pdf, Pipeline*); - std::set getWantedJSONObjects(); + QPDFObjGen::set getWantedJSONObjects(); void doJSONObject( Pipeline* p, bool& first, std::string const& key, QPDFObjectHandle&); void doJSONObjects(Pipeline* p, bool& first, QPDF& pdf); diff --git a/libqpdf/QPDFJob.cc b/libqpdf/QPDFJob.cc index 39ff1300..37dbf3fe 100644 --- a/libqpdf/QPDFJob.cc +++ b/libqpdf/QPDFJob.cc @@ -1001,18 +1001,16 @@ QPDFJob::parse_object_id( } } -std::set +QPDFObjGen::set QPDFJob::getWantedJSONObjects() { - std::set wanted_og; + QPDFObjGen::set wanted_og; for (auto const& iter: m->json_objects) { bool trailer; int obj = 0; int gen = 0; parse_object_id(iter, trailer, obj, gen); - if (obj) { - wanted_og.insert(QPDFObjGen(obj, gen)); - } + wanted_og.add(QPDFObjGen(obj, gen)); } return wanted_og; }