Minor cleanups

Author: LaurenzV

CHANGELOG.md

@@ -17,6 +17,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - TODO: The CLI options have been (temporarily) removed. They will be readded before the next release.
 - TODO: Add tests for CLI and svg options
 - TODO: Add CLI option to convert text to paths.
+- TODO: Add CI test to test builds with different feature
+- TODO: Add text feature?
 
 ### Changed
 - Bumped resvg to v0.40.

Cargo.lock

@@ -27,7 +27,6 @@ miniz_oxide = { workspace = true }
 pdf-writer = { workspace = true }
 svg2pdf = { workspace = true }
 termcolor = { workspace = true }
-ttf-parser = "0.20.0"
 usvg = { workspace = true }
 
 [features]

cli/Cargo.toml

@@ -33,7 +33,7 @@ pub fn convert_(input: &PathBuf, output: Option<PathBuf>) -> Result<(), String>
     let tree =
         usvg::Tree::from_str(&svg, &options, &fontdb).map_err(|err| err.to_string())?;
 
-    let pdf = svg2pdf::to_pdf(&tree, Options::default(), fontdb);
+    let pdf = svg2pdf::to_pdf(&tree, Options::default(), &fontdb);
 
     std::fs::write(output, pdf).map_err(|_| "Failed to write PDF file")?;
 

cli/src/convert.rs

@@ -128,7 +128,7 @@ impl Default for Options {
 /// # Ok(()) }
 /// ```
 pub fn to_pdf(tree: &Tree, options: Options, fontdb: &fontdb::Database) -> Vec<u8> {
-    let mut ctx = Context::new(tree, options, &fontdb);
+    let mut ctx = Context::new(tree, options, fontdb);
     let mut pdf = Pdf::new();
 
     let catalog_ref = ctx.alloc_ref();
@@ -279,7 +279,7 @@ pub fn to_chunk(
 ) -> (Chunk, Ref) {
     let mut chunk = Chunk::new();
 
-    let mut ctx = Context::new(tree, options, &fontdb);
+    let mut ctx = Context::new(tree, options, fontdb);
     let x_ref = tree_to_xobject(tree, &mut chunk, &mut ctx);
     ctx.write_global_objects(&mut chunk);
     (chunk, x_ref)

src/lib.rs

@@ -40,9 +40,7 @@ pub fn tree_to_stream(
     content.restore_state();
 }
 
-/// Convert a tree into a XObject of size 1x1, similar to an image. The Ref of that
-/// XObject is guaranteed to be the current highest, so you can use `ref.next()` to
-/// get the next free ID.
+/// Convert a tree into a XObject of size 1x1, similar to an image.
 pub fn tree_to_xobject(tree: &Tree, chunk: &mut Chunk, ctx: &mut Context) -> Ref {
     let bbox = tree.size().to_non_zero_rect(0.0, 0.0);
     let x_ref = ctx.alloc_ref();

src/render/mod.rs

@@ -90,7 +90,7 @@ impl Context {
             sgray_ref: None,
         };
 
-        fill_fonts(tree.root(), &mut ctx, &fontdb);
+        fill_fonts(tree.root(), &mut ctx, fontdb);
 
         ctx
     }
@@ -120,7 +120,7 @@ impl Context {
 
     pub fn write_global_objects(&mut self, pdf: &mut Chunk) {
         let allocator = &mut self.ref_allocator;
-        for (_, font) in &mut self.fonts {
+        for font in self.fonts.values_mut() {
             if let Some(font) = font.as_mut() {
                 write_font(pdf, allocator, font);
             }