minor fixes

Author: LaurenzV

cli/src/convert.rs

@@ -1,4 +1,5 @@
 use std::path::{Path, PathBuf};
+use std::sync::Arc;
 use svg2pdf::{ConversionOptions, PageOptions};
 
 pub fn convert_(
@@ -11,23 +12,24 @@ pub fn convert_(
         log::set_max_level(log::LevelFilter::Warn);
     }
 
+    let mut fontdb = fontdb::Database::new();
+    fontdb.load_system_fonts();
+
+    fontdb.set_serif_family("Times New Roman");
+    fontdb.set_sans_serif_family("Arial");
+    fontdb.set_cursive_family("Comic Sans MS");
+    fontdb.set_fantasy_family("Impact");
+    fontdb.set_monospace_family("Courier New");
+
     #[cfg(feature = "text")]
-    let mut options = usvg::Options::default();
+    let mut options = usvg::Options {
+        fontdb: Arc::new(fontdb),
+        ..usvg::Options::default()
+    };
 
     #[cfg(not(feature = "text"))]
     let options = usvg::Options::default();
 
-    #[cfg(feature = "text")]
-    {
-        options.fontdb_mut().load_system_fonts();
-
-        options.fontdb_mut().set_serif_family("Times New Roman");
-        options.fontdb_mut().set_sans_serif_family("Arial");
-        options.fontdb_mut().set_cursive_family("Comic Sans MS");
-        options.fontdb_mut().set_fantasy_family("Impact");
-        options.fontdb_mut().set_monospace_family("Courier New");
-    }
-
     // Convert the file.
     let name = Path::new(input.file_name().ok_or("Input path does not point to a file")?);
     let output = output.unwrap_or_else(|| name.with_extension("pdf"));

tests/src/lib.rs

@@ -109,7 +109,7 @@ fn is_pix_diff(pixel1: &Rgba<u8>, pixel2: &Rgba<u8>) -> bool {
         || pixel1.0[3] != pixel2.0[3]
 }
 
-const REPLACE: bool = true;
+const REPLACE: bool = false;
 const PDF: bool = false;
 
 pub fn get_diff(