fix examples

pdf-rs · Jul 28, 2023 · 284d81c · 284d81c
1 parent 96c002c
commit 284d81c
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 9 deletions.
diff --git a/pdf/examples/content.rs b/pdf/examples/content.rs
@@ -6,6 +6,9 @@ use pdf::error::PdfError;
 use pdf::content::*;
 use pdf::file::FileOptions;
 use pdf::file::Trailer;
+use pdf::font::Font;
+use pdf::font::FontData;
+use pdf::font::TFont;
 use pdf::object::*;
 use pdf::build::*;
 use pdf::primitive::Dictionary;
@@ -21,8 +24,8 @@ fn main() -> Result<(), PdfError> {
     let content = Content::from_ops(vec![
         Op::MoveTo { p: Point { x: 100., y: 100. } },
         Op::LineTo { p: Point { x: 100., y: 200. } },
-        Op::LineTo { p: Point { x: 200., y: 100. } },
         Op::LineTo { p: Point { x: 200., y: 200. } },
+        Op::LineTo { p: Point { x: 200., y: 100. } },
         Op::Close,
         Op::Stroke,
     ]);
@@ -34,7 +37,19 @@ fn main() -> Result<(), PdfError> {
         right: 400.0
     });
     let resources = Resources::default();
-    new_page.resources = Some(MaybeRef::Direct(Arc::new(resources)));
+    /*
+    let font = Font {
+        name: Some("Test".into()),
+        subtype: pdf::font::FontType::TrueType,
+        data: FontData::TrueType(TFont {
+            base_font: None,
+            
+        })
+    }
+    resources.fonts.insert("f1", font);
+    */
+
+    new_page.resources = Some(MaybeRef::Indirect(builder.storage.create(resources)?));
     pages.push(new_page);
 
     let catalog = CatalogBuilder::from_pages(pages);

diff --git a/pdf/examples/metadata.rs b/pdf/examples/metadata.rs
@@ -12,11 +12,7 @@ fn main() -> Result<(), PdfError> {
 
     let file = FileOptions::cached().open(&path).unwrap();
     if let Some(ref info) = file.trailer.info_dict {
-        info.iter()
-            .filter(|(_, primitive)| primitive.to_string_lossy().is_ok())
-            .for_each(|(key, value)| {
-                eprintln!("{:>15}: {}", key, value.to_string_lossy().unwrap());
-            });
+        dbg!(info);
     }
 
     if let Some(ref forms) = file.get_root().forms {

diff --git a/pdf/examples/read.rs b/pdf/examples/read.rs
@@ -19,8 +19,8 @@ fn main() -> Result<(), PdfError> {
 
     let file = FileOptions::cached().open(&path).unwrap();
     if let Some(ref info) = file.trailer.info_dict {
-        let title = info.get("Title").and_then(|p| p.to_string_lossy().ok());
-        let author = info.get("Author").and_then(|p| p.to_string_lossy().ok());
+        let title = info.title.as_ref().map(|p| p.to_string_lossy());
+        let author = info.author.as_ref().map(|p| p.to_string_lossy());
 
         let descr = match (title, author) {
             (Some(title), None) => title,