Commit 9db2965f628640e8ed19797a5fc8a31172cb6e7d

Authored by m-holger
1 parent 0c45bd87

Use QPDFObjGen::set in QPDFJob::getWantedJSONObjects

include/qpdf/QPDFJob.hh
... ... @@ -571,7 +571,7 @@ class QPDFJob
571 571  
572 572 // JSON
573 573 void doJSON(QPDF& pdf, Pipeline*);
574   - std::set<QPDFObjGen> getWantedJSONObjects();
  574 + QPDFObjGen::set getWantedJSONObjects();
575 575 void doJSONObject(
576 576 Pipeline* p, bool& first, std::string const& key, QPDFObjectHandle&);
577 577 void doJSONObjects(Pipeline* p, bool& first, QPDF& pdf);
... ...
libqpdf/QPDFJob.cc
... ... @@ -1001,18 +1001,16 @@ QPDFJob::parse_object_id(
1001 1001 }
1002 1002 }
1003 1003  
1004   -std::set<QPDFObjGen>
  1004 +QPDFObjGen::set
1005 1005 QPDFJob::getWantedJSONObjects()
1006 1006 {
1007   - std::set<QPDFObjGen> wanted_og;
  1007 + QPDFObjGen::set wanted_og;
1008 1008 for (auto const& iter: m->json_objects) {
1009 1009 bool trailer;
1010 1010 int obj = 0;
1011 1011 int gen = 0;
1012 1012 parse_object_id(iter, trailer, obj, gen);
1013   - if (obj) {
1014   - wanted_og.insert(QPDFObjGen(obj, gen));
1015   - }
  1013 + wanted_og.add(QPDFObjGen(obj, gen));
1016 1014 }
1017 1015 return wanted_og;
1018 1016 }
... ...