From b85a590bc51796f0495be7550da7c4e9975ccaca Mon Sep 17 00:00:00 2001 From: m-holger Date: Sun, 14 Jan 2024 16:53:08 +0000 Subject: Tweak Handlers::beginUnderOverlay and beginPages --- libqpdf/QPDFJob_json.cc | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/libqpdf/QPDFJob_json.cc b/libqpdf/QPDFJob_json.cc index fefe8fff..b3568cf5 100644 --- a/libqpdf/QPDFJob_json.cc +++ b/libqpdf/QPDFJob_json.cc @@ -232,14 +232,8 @@ void Handlers::beginUnderOverlay(JSON const& j) { // File has to be processed before items, so handle it here. - bool file_seen = false; std::string file; - j.forEachDictItem([&](std::string const& key, JSON const& value) { - if (key == "file") { - file_seen = value.getString(file); - } - }); - if (!file_seen) { + if (!j.getDictItem("file").getString(file)) { QTC::TC("qpdf", "QPDFJob json over/under no file"); usage("file is required in underlay/overlay specification"); } @@ -488,14 +482,8 @@ Handlers::endPagesArray() void Handlers::beginPages(JSON j) { - bool file_seen = false; std::string file; - j.forEachDictItem([&](std::string const& key, JSON const& value) { - if (key == "file") { - file_seen = value.getString(file); - } - }); - if (!file_seen) { + if (!j.getDictItem("file").getString(file)) { QTC::TC("qpdf", "QPDFJob json pages no file"); usage("file is required in page specification"); } -- cgit v1.2.3-70-g09d2