diff options
| author | m-holger <m-holger@kubitscheck.org> | 2023-03-05 13:44:02 +0100 |
|---|---|---|
| committer | Jay Berkenbilt <jberkenbilt@users.noreply.github.com> | 2023-03-05 15:01:49 +0100 |
| commit | b27be3ed27890ae8226560817f14c117927cee55 (patch) | |
| tree | 26507e0b573a35033046ad2af8ebde66101e0ef5 | |
| parent | 284b8efbc6416d0a8dd1931385f68da1eaf271a2 (diff) | |
| download | qpdf-b27be3ed27890ae8226560817f14c117927cee55.tar.zst | |
Remove redundant parameter from QPDFJob::handlePageSpecs and doSplitPages
| -rw-r--r-- | include/qpdf/QPDFJob.hh | 8 | ||||
| -rw-r--r-- | libqpdf/QPDFJob.cc | 15 |
2 files changed, 7 insertions, 16 deletions
diff --git a/include/qpdf/QPDFJob.hh b/include/qpdf/QPDFJob.hh index 3b6a3a27..9bf81fcc 100644 --- a/include/qpdf/QPDFJob.hh +++ b/include/qpdf/QPDFJob.hh @@ -517,10 +517,8 @@ class QPDFJob // Transformations void setQPDFOptions(QPDF& pdf); - void handlePageSpecs( - QPDF& pdf, - bool& warnings, - std::vector<std::shared_ptr<QPDF>>& page_heap); + void + handlePageSpecs(QPDF& pdf, std::vector<std::shared_ptr<QPDF>>& page_heap); bool shouldRemoveUnreferencedResources(QPDF& pdf); void handleRotations(QPDF& pdf); void @@ -549,7 +547,7 @@ class QPDFJob void doShowAttachment(QPDF& pdf); // Output generation - void doSplitPages(QPDF& pdf, bool& warnings); + void doSplitPages(QPDF& pdf); void setWriterOptions(QPDF& pdf, QPDFWriter& w); void setEncryptionOptions(QPDF&, QPDFWriter&); void maybeFixWritePassword(int R, std::string& password); diff --git a/libqpdf/QPDFJob.cc b/libqpdf/QPDFJob.cc index 71610672..87ec32b9 100644 --- a/libqpdf/QPDFJob.cc +++ b/libqpdf/QPDFJob.cc @@ -486,10 +486,9 @@ QPDFJob::run() pdf.updateFromJSON(this->m->update_from_json); } - bool other_warnings = false; std::vector<std::shared_ptr<QPDF>> page_heap; if (!m->page_specs.empty()) { - handlePageSpecs(pdf, other_warnings, page_heap); + handlePageSpecs(pdf, page_heap); } if (!m->rotations.empty()) { handleRotations(pdf); @@ -500,7 +499,7 @@ QPDFJob::run() if (!createsOutput()) { doInspection(pdf); } else if (m->split_pages) { - doSplitPages(pdf, other_warnings); + doSplitPages(pdf); } else { writeOutfile(pdf); } @@ -2541,7 +2540,7 @@ added_page(QPDF& pdf, QPDFPageObjectHelper page) void QPDFJob::handlePageSpecs( - QPDF& pdf, bool& warnings, std::vector<std::shared_ptr<QPDF>>& page_heap) + QPDF& pdf, std::vector<std::shared_ptr<QPDF>>& page_heap) { // Parse all page specifications and translate them into lists of // actual pages. @@ -2787,9 +2786,6 @@ QPDFJob::handlePageSpecs( } } } - if (page_data.qpdf->anyWarnings()) { - warnings = true; - } if (cis) { cis->stayOpen(false); } @@ -3176,7 +3172,7 @@ QPDFJob::setWriterOptions(QPDF& pdf, QPDFWriter& w) } void -QPDFJob::doSplitPages(QPDF& pdf, bool& warnings) +QPDFJob::doSplitPages(QPDF& pdf) { // Generate output file pattern std::string before; @@ -3272,9 +3268,6 @@ QPDFJob::doSplitPages(QPDF& pdf, bool& warnings) doIfVerbose([&](Pipeline& v, std::string const& prefix) { v << prefix << ": wrote file " << outfile << "\n"; }); - if (outpdf.anyWarnings()) { - warnings = true; - } } } |