some hacks to reuse existing streams

pdf-rs · Dec 15, 2024 · 1bde313 · 1bde313
1 parent e113662
commit 1bde313
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 14 deletions.
diff --git a/examples/src/bin/add_annot.rs b/examples/src/bin/add_annot.rs
@@ -46,7 +46,7 @@ fn run() -> Result<(), PdfError> {
         //     right: 300.961,
         //     top: 742.55,
         // }),
-        rect: None,
+        rect: Some(Rectangle { left: 10., bottom: 10., right: 200., top: 200. }),
         contents: None,
         page: Some(old_page.clone()),
         border: None,
@@ -61,10 +61,10 @@ fn run() -> Result<(), PdfError> {
         ink_list: None,
         line: Some(Primitive::Array(
             vec![
-                Primitive::Number(95.774), 
-                Primitive::Number(734.237), 
-                Primitive::Number(320.961),
-                Primitive::Number(734.863)
+                Primitive::Number(10.), 
+                Primitive::Number(100.), 
+                Primitive::Number(20.),
+                Primitive::Number(200.)
                 ]
         )),
         // creation_date: None,
@@ -98,7 +98,7 @@ fn run() -> Result<(), PdfError> {
             old_file.update_ref(&r, annots).unwrap();
         }
     }
-    old_file.save_to("/Users/apple/Downloads/test_pdf/out.pdf")?;
+    old_file.save_to("out.pdf")?;
 
     Ok(())
 }

diff --git a/pdf/src/content.rs b/pdf/src/content.rs
@@ -754,7 +754,10 @@ impl ObjectWrite for Content {
     fn to_primitive(&self, update: &mut impl Updater) -> Result<Primitive> {
         if self.parts.len() == 1 {
             let obj = self.parts[0].to_primitive(update)?;
-            update.create(obj)?.to_primitive(update)
+            match obj {
+                Primitive::Reference(_) => Ok(obj),
+                _ => update.create(obj)?.to_primitive(update)
+            }
         } else {
             self.parts.to_primitive(update)
         }

diff --git a/pdf/src/object/stream.rs b/pdf/src/object/stream.rs
@@ -170,7 +170,10 @@ impl<I: ObjectWrite> Stream<I> {
 }
 impl<I: ObjectWrite> ObjectWrite for Stream<I> {
     fn to_primitive(&self, update: &mut impl Updater) -> Result<Primitive> {
-        self.to_pdf_stream(update).map(Primitive::Stream)
+        match self.inner_data {
+            StreamData::Original(_, id) => Ok(Primitive::Reference(id)),
+            _ => self.to_pdf_stream(update).map(Primitive::Stream),
+        }
     }
 }
 impl<I: DeepClone> DeepClone for Stream<I> {

diff --git a/pdf/src/primitive.rs b/pdf/src/primitive.rs
@@ -268,23 +268,26 @@ impl Object for PdfStream {
 }
 impl ObjectWrite for PdfStream {
     fn to_primitive(&self, update: &mut impl Updater) -> Result<Primitive> {
-        Ok(self.clone().into())
+        match self.inner {
+            StreamInner::InFile { id, .. } => Ok(Primitive::Reference(id)),
+            StreamInner::Pending { .. } => Ok(self.clone().into()),
+        }
     }
 }
 impl PdfStream {
     pub fn serialize(&self, out: &mut impl io::Write) -> Result<()> {
-        self.info.serialize(out)?;
 
-        writeln!(out, "stream")?;
         match self.inner {
-            StreamInner::InFile { .. } => {
-                unimplemented!()
+            StreamInner::InFile { id, .. } => {
+                Primitive::Reference(id).serialize(out)?;
             }
             StreamInner::Pending { ref data } => {
+                self.info.serialize(out)?;
+                writeln!(out, "stream")?;
                 out.write_all(data)?;
+                writeln!(out, "\nendstream")?;
             }
         }
-        writeln!(out, "\nendstream")?;
         Ok(())
     }
     pub fn raw_data(&self, resolve: &impl Resolve) -> Result<Arc<[u8]>> {