Add method QPDFObject::resolve

m-holger
1 parent 56e9bcab
Showing 4 changed files with 21 additions and 5 deletions
include/qpdf/QPDF.hh
include/qpdf/QPDFObject.hh
libqpdf/QPDFObject.cc
libqpdf/QPDFObjectHandle.cc
@@ -843,7 +843,7 @@ class QPDF
     // it can resolve indirect references.
     class Resolver
     {
-        friend class QPDFObjectHandle;
+        friend class QPDFObject;
  
       private:
         static void
@@ -153,10 +153,19 @@ class QPDFObject
     }
  
     bool
-    isUnresolved()
+    isUnresolved() const
     {
         return value->type_code == ::ot_unresolved;
     }
+    void
+    resolve()
+    {
+        if (isUnresolved()) {
+            doResolve();
+        }
+    }
+    void doResolve();
+
     template <typename T>
     T*
     as()
 #include <qpdf/QPDFObject.hh>
+
+#include <qpdf/QPDF.hh>
+
+void
+QPDFObject::doResolve()
+{
+    auto og = value->og;
+    QPDF::Resolver::resolve(value->qpdf, og);
+}
@@ -2595,9 +2595,7 @@ QPDFObjectHandle::dereference()
     if (!isInitialized()) {
         return false;
     }
-    if (this->obj->isUnresolved()) {
-        QPDF::Resolver::resolve(this->qpdf, getObjGen());
-    }
+    this->obj->resolve();
     return true;
 }