Refactor: replace direct `_qpdf` parsing with structured `Dictionary`/`Name` API…

… for improved code readability and maintainability.

Refactor: replace direct `_qpdf` parsing with structured `Dictionary`/`Name` API…
… for improved code readability and maintainability.
m-holger
1 parent 0a0eb92a
Showing 5 changed files with 12 additions and 12 deletions
libqpdf/NNTree.cc
libqpdf/QPDFJob.cc
libqpdf/QPDFPageLabelDocumentHelper.cc
libqpdf/QPDFPageObjectHelper.cc
libqpdf/QPDF_pages.cc
@@ -872,7 +872,7 @@ QPDFNameTreeObjectHelper::QPDFNameTreeObjectHelper(
 QPDFNameTreeObjectHelper
 QPDFNameTreeObjectHelper::newEmpty(QPDF& qpdf, bool auto_repair)
 {
-    return {qpdf.makeIndirectObject("<< /Names [] >>"_qpdf), qpdf, auto_repair};
+    return {qpdf.makeIndirectObject(Dictionary({{"/Names", Array::empty()}})), qpdf, auto_repair};
 }
 QPDFNameTreeObjectHelper::iterator::iterator(std::shared_ptr<NNTreeIterator> const& i) :
@@ -1068,7 +1068,7 @@ QPDFNumberTreeObjectHelper::QPDFNumberTreeObjectHelper(
 QPDFNumberTreeObjectHelper
 QPDFNumberTreeObjectHelper::newEmpty(QPDF& qpdf, bool auto_repair)
 {
-    return {qpdf.makeIndirectObject("<< /Nums [] >>"_qpdf), qpdf, auto_repair};
+    return {qpdf.makeIndirectObject(Dictionary({{"/Nums", Array::empty()}})), qpdf, auto_repair};
 }
 QPDFNumberTreeObjectHelper::iterator::iterator(std::shared_ptr<NNTreeIterator> const& i) :
@@ -1883,7 +1883,7 @@ QPDFJob::doUnderOverlayForPage(
             fo[from_no.no][uo_idx], name, dest_page.getTrimBox().getArrayAsRectangle(), cm);
         dest_page.copyAnnotations(from_page, cm, &dest_afdh, &from_page.qpdf()->doc().acroform());
         if (!new_content.empty()) {
-            resources.mergeResources("<< /XObject << >> >>"_qpdf);
+            resources.mergeResources(Dictionary({{"/XObject", Dictionary::empty()}}));
             auto xobject = resources.getKey("/XObject");
             if (xobject.isDictionary()) {
                 xobject.replaceKey(name, fo[from_no.no][uo_idx]);
@@ -131,19 +131,19 @@ QPDFPageLabelDocumentHelper::pageLabelDict(
     case pl_none:
         break;
     case pl_digits:
-        num.replaceKey("/S", "/D"_qpdf);
+        num.replaceKey("/S", Name("/D"));
         break;
     case pl_alpha_lower:
-        num.replaceKey("/S", "/a"_qpdf);
+        num.replaceKey("/S", Name("/a"));
         break;
     case pl_alpha_upper:
-        num.replaceKey("/S", "/A"_qpdf);
+        num.replaceKey("/S", Name("/A"));
         break;
     case pl_roman_lower:
-        num.replaceKey("/S", "/r"_qpdf);
+        num.replaceKey("/S", Name("/r"));
         break;
     case pl_roman_upper:
-        num.replaceKey("/S", "/R"_qpdf);
+        num.replaceKey("/S", Name("/R"));
         break;
     }
     if (!prefix.empty()) {
@@ -406,7 +406,7 @@ QPDFPageObjectHelper::externalizeInlineImages(size_t min_size, bool shallow)
         QPDFObjectHandle resources = getAttribute("/Resources", true);
         // Calling mergeResources also ensures that /XObject becomes direct and is not shared with
         // other pages.
-        resources.mergeResources("<< /XObject << >> >>"_qpdf);
+        resources.mergeResources(Dictionary({{"/XObject", Dictionary::empty()}}));
         InlineImageTracker iit(oh().getOwningQPDF(), min_size, resources);
         Pl_Buffer b("new page content");
         bool filtered = false;
@@ -121,7 +121,7 @@ Pages::getAllPagesInternal(
         // Unconditionally setting the /Type to /Pages could cause problems, but trying to
         // accommodate the possibility may be excessive.
         cur_node.warn("/Type key should be /Pages but is not; overriding");
-        cur_node.replaceKey("/Type", "/Pages"_qpdf);
+        cur_node.replaceKey("/Type", Name("/Pages"));
     }
     if (!media_box) {
         media_box = cur_node.getKey("/MediaBox").isRectangle();
@@ -226,7 +226,7 @@ Pages::getAllPagesInternal(
             }
             if (!kid.isDictionaryOfType("/Page")) {
                 kid.warn("/Type key should be /Page but is not; overriding");
-                kid.replaceKey("/Type", "/Page"_qpdf);
+                kid.replaceKey("/Type", Name("/Page"));
                 ++errors;
             }
             if (m->reconstructed_xref && errors > 2) {
@@ -698,7 +698,7 @@ Pages::flatten_annotations_for_page(
             std::string content =
                 aoh.getPageContentForAppearance(name, rotate, required_flags, forbidden_flags);
             if (!content.empty()) {
-                resources.mergeResources("<< /XObject << >> >>"_qpdf);
+                resources.mergeResources(Dictionary({{"/XObject", Dictionary({{name, as}})}}));
                 resources.getKey("/XObject").replaceKey(name, as);
                 ++next_fx;
             }