have Lazy resolve into MaybeRef

pdf-rs · Jan 5, 2025 · 0378c6d · 0378c6d
1 parent 83e4a97
commit 0378c6d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/examples/src/bin/form.rs b/examples/src/bin/form.rs
@@ -44,7 +44,7 @@ fn run() -> Result<(), PdfError> {
 
     let page0 = file.get_page(0).unwrap();
     let annots = page0.annotations.load(&file.resolver()).expect("can't load annotations");
-    for annot in &annots {
+    for annot in &*annots {
         if let Some(ref a) = annot.appearance_streams {
             let normal = file.resolver().get(a.normal);
             if let Ok(normal) = normal {
@@ -122,4 +122,4 @@ fn main() {
     if let Err(e) = run() {
         println!("{e}");
     }
-}
+}
diff --git a/pdf/src/object/mod.rs b/pdf/src/object/mod.rs
@@ -451,9 +451,12 @@ impl<T: Object> DeepClone for Lazy<T> {
         })
     }
 }
-impl<T: Object> Lazy<T> {
-    pub fn load(&self, resolve: &impl Resolve) -> Result<T> {
-        T::from_primitive(self.primitive.clone(), resolve)
+impl<T: Object + DataSize> Lazy<T> {
+    pub fn load(&self, resolve: &impl Resolve) -> Result<MaybeRef<T>> {
+        match self.primitive {
+            Primitive::Reference(r) => resolve.get(Ref::new(r)).map(MaybeRef::Indirect),
+            ref p => T::from_primitive(p.clone(), resolve).map(|o| MaybeRef::Direct(Arc::new(o))),
+        }
     }
 }
 impl<T: Object> Object for Lazy<T> {