Handle inheritable page attributes

Add getAttribute for handling inheritable page attributes, and fix
getPageImages and annotation flattening code to use it.

1 files changed, 1 insertions, 9 deletions

diff --git a/libqpdf/QPDFPageDocumentHelper.cc b/libqpdf/QPDFPageDocumentHelper.cc
index fa50c471..3eec789b 100644
--- a/libqpdf/QPDFPageDocumentHelper.cc
+++ b/libqpdf/QPDFPageDocumentHelper.cc
@@ -79,20 +79,12 @@ QPDFPageDocumentHelper::flattenAnnotations(
             "document does not have updated appearance streams,"
             " so form fields will not be flattened");
     }
-    pushInheritedAttributesToPage();
     std::vector<QPDFPageObjectHelper> pages = getAllPages();
     for (std::vector<QPDFPageObjectHelper>::iterator iter = pages.begin();
          iter != pages.end(); ++iter)
     {
         QPDFPageObjectHelper ph(*iter);
-        QPDFObjectHandle page_oh = ph.getObjectHandle();
-        if (page_oh.getKey("/Resources").isIndirect())
-        {
-            QTC::TC("qpdf", "QPDFPageDocumentHelper indirect resources");
-            page_oh.replaceKey("/Resources",
-                               page_oh.getKey("/Resources").shallowCopy());
-        }
-        QPDFObjectHandle resources = ph.getObjectHandle().getKey("/Resources");
+        QPDFObjectHandle resources = ph.getAttribute("/Resources", true);
         if (! resources.isDictionary())
         {
             // This should never happen and is not exercised in the