Refactor `QPDFJob::Inputs`: add `clear` method to centralize QPDF object cleanup…

…, replace redundant file warning logic in `handlePageSpecs`, and simplify resource management.

Refactor `QPDFJob::Inputs`: add `clear` method to centralize QPDF object cleanup…
…, replace redundant file warning logic in `handlePageSpecs`, and simplify resource management.
m-holger
1 parent a43b8312
Showing 3 changed files with 21 additions and 13 deletions
include/qpdf/QPDFJob.hh
libqpdf/QPDFJob.cc
libqpdf/qpdf/QPDFJob_private.hh
@@ -461,7 +461,7 @@ class QPDFJob
     // Transformations
     void setQPDFOptions(QPDF& pdf);
-    bool handlePageSpecs(QPDF& pdf);
+    void handlePageSpecs(QPDF& pdf);
     bool shouldRemoveUnreferencedResources(QPDF& pdf);
     void new_selection(
         std::string const& filename, std::string const& password, std::string const& range);
@@ -426,15 +426,14 @@ QPDFJob::createQPDF()
     }
     if (!m->selections.empty()) {
-        if (!handlePageSpecs(pdf)) {
-            m->warnings = true;
-        }
+        handlePageSpecs(pdf);
     }
     if (!m->rotations.empty()) {
         handleRotations(pdf);
     }
     handleUnderOverlay(pdf);
     handleTransformations(pdf);
+    m->warnings |= m->inputs.clear();
     auto root = pdf.getRoot();
     if (m->remove_info) {
@@ -2414,8 +2413,21 @@ QPDFJob::Inputs::process_all()
     }
 }
-// Handle all page specifications. Return true if it succeeded without warnings.
 bool
+QPDFJob::Inputs::clear()
+{
+    bool any_warnings = false;
+    for (auto& [filename, file_spec]: files) {
+        if (auto& pdf = file_spec.qpdf_p) {
+            any_warnings |= pdf->anyWarnings();
+            pdf = nullptr;
+        }
+    }
+    return any_warnings;
+}
+
+// Handle all page specifications.
+void
 QPDFJob::handlePageSpecs(QPDF& pdf)
 {
     auto& main_input = m->inputs.files[m->infilename];
@@ -2615,14 +2627,6 @@ QPDFJob::handlePageSpecs(QPDF&amp; pdf)
             }
         }
     }
-    for (auto& foreign: m->inputs.files) {
-        if (foreign.second.qpdf_p) { // exclude main input
-            if (foreign.second.qpdf->anyWarnings()) {
-                return false;
-            }
-        }
-    }
-    return true;
 }
 void
@@ -62,6 +62,10 @@ struct QPDFJob::Inputs
     }
     void process(std::string const& filename, QPDFJob::Input& file_spec);
     void process_all();
+
+    // Destroy all owned QPDF objects. Return false if any of the QPDF objects recorded warnings.
+    bool clear();
+
     std::string encryption_file;
     std::string encryption_file_password;
     bool keep_files_open{true};