Refactor `QPDF`: centralize access to `QPDFAcroFormDocumentHelper` using a dedic…

…ated `acroform()` method and update related references for improved performance, consistency and maintainability.

Refactor `QPDF`: centralize access to `QPDFAcroFormDocumentHelper` using a dedic…
…ated `acroform()` method and update related references for improved performance, consistency and maintainability.
m-holger
1 parent 79a9701f
Showing 5 changed files with 21 additions and 4 deletions
include/qpdf/QPDF.hh
libqpdf/QPDFFormFieldObjectHelper.cc
libqpdf/QPDFJob.cc
libqpdf/QPDFPageDocumentHelper.cc
libqpdf/qpdf/QPDF_private.hh
@@ -57,6 +57,7 @@ class BitWriter;
 class BufferInputSource;
 class QPDFLogger;
 class QPDFParser;
+class QPDFAcroFormDocumentHelper;
 class QPDF
 {
@@ -792,6 +793,7 @@ class QPDF
     class JobSetter;
     inline bool reconstructed_xref() const;
+    inline QPDFAcroFormDocumentHelper& acroform();
     // For testing only -- do not add to DLL
     static bool test_json_validators();
@@ -5,6 +5,7 @@
 #include <qpdf/QPDFAcroFormDocumentHelper.hh>
 #include <qpdf/QPDFAnnotationObjectHelper.hh>
 #include <qpdf/QPDFObjectHandle_private.hh>
+#include <qpdf/QPDF_private.hh>
 #include <qpdf/QTC.hh>
 #include <qpdf/QUtil.hh>
 #include <cstdlib>
@@ -337,7 +338,7 @@ QPDFFormFieldObjectHelper::setV(QPDFObjectHandle value, bool need_appearances)
         QPDF& qpdf = oh().getQPDF(
             "QPDFFormFieldObjectHelper::setV called with need_appearances = "
             "true on an object that is not associated with an owning QPDF");
-        QPDFAcroFormDocumentHelper(qpdf).setNeedAppearances(true);
+        qpdf.acroform().setNeedAppearances(true);
     }
 }
@@ -1180,7 +1180,7 @@ void
 QPDFJob::doJSONAcroform(Pipeline* p, bool& first, QPDF& pdf)
 {
     JSON j_acroform = JSON::makeDictionary();
-    QPDFAcroFormDocumentHelper afdh(pdf);
+    auto& afdh = pdf.acroform();
     j_acroform.addDictionaryMember("hasacroform", JSON::makeBool(afdh.hasAcroForm()));
     j_acroform.addDictionaryMember("needappearances", JSON::makeBool(afdh.getNeedAppearances()));
     JSON j_fields = j_acroform.addDictionaryMember("fields", JSON::makeArray());
@@ -3013,7 +3013,7 @@ QPDFJob::doSplitPages(QPDF&amp; pdf)
         dh.removeUnreferencedResources();
     }
     QPDFPageLabelDocumentHelper pldh(pdf);
-    QPDFAcroFormDocumentHelper afdh(pdf);
+    auto& afdh = pdf.acroform();
     std::vector<QPDFObjectHandle> const& pages = pdf.getAllPages();
     size_t pageno_len = std::to_string(pages.size()).length();
     size_t num_pages = pages.size();
 #include <qpdf/QPDFPageDocumentHelper.hh>
 #include <qpdf/QPDFAcroFormDocumentHelper.hh>
+#include <qpdf/QPDF_private.hh>
 #include <qpdf/QTC.hh>
 #include <qpdf/QUtil.hh>
@@ -55,7 +56,7 @@ QPDFPageDocumentHelper::removePage(QPDFPageObjectHelper page)
 void
 QPDFPageDocumentHelper::flattenAnnotations(int required_flags, int forbidden_flags)
 {
-    QPDFAcroFormDocumentHelper afdh(qpdf);
+    auto& afdh = qpdf.acroform();
     if (afdh.getNeedAppearances()) {
         qpdf.getRoot()
             .getKey("/AcroForm")
@@ -3,6 +3,7 @@
 #include <qpdf/QPDF.hh>
+#include <qpdf/QPDFAcroFormDocumentHelper.hh>
 #include <qpdf/QPDFObject_private.hh>
 #include <qpdf/QPDFTokenizer_private.hh>
@@ -547,6 +548,9 @@ class QPDF::Members
     // Optimization data
     std::map<ObjUser, std::set<QPDFObjGen>> obj_user_to_objects;
     std::map<QPDFObjGen, std::set<ObjUser>> object_to_obj_users;
+
+    // Document Helpers;
+    std::unique_ptr<QPDFAcroFormDocumentHelper> acroform;
 };
 // JobSetter class is restricted to QPDFJob.
@@ -569,4 +573,13 @@ QPDF::reconstructed_xref() const
     return m->reconstructed_xref;
 }
+inline QPDFAcroFormDocumentHelper&
+QPDF::acroform()
+{
+    if (!m->acroform) {
+        m->acroform = std::make_unique<QPDFAcroFormDocumentHelper>(*this);
+    }
+    return *m->acroform;
+}
+
 #endif // QPDF_PRIVATE_HH