Update resvg and use re-export of tiny-skia from resvg

ardaku · May 29, 2023 · 5e8e2da · 5e8e2da
1 parent 2f5f456
commit 5e8e2da
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 77 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/alloy/Cargo.toml b/alloy/Cargo.toml
@@ -63,8 +63,7 @@ lexical-sort = "0.3"
 trash = { version = "3.0", default-features = false }
 kamadak-exif = "0.5"
 arboard = "3.2"
-resvg = "0.33"
-tiny-skia = "0.9"
+resvg = "0.34"
 log = "0.4"
 env_logger = "0.10"
 pico-args = "0.5"

diff --git a/alloy/src/image_cache/image_loader.rs b/alloy/src/image_cache/image_loader.rs
@@ -16,6 +16,7 @@ use gelatin::image::{
     AnimationDecoder, ImageFormat,
 };
 use resvg::{
+    tiny_skia::{Pixmap, Transform},
     usvg::{self, TreeParsing},
     Tree,
 };
@@ -190,12 +191,9 @@ pub fn load_svg(path: &std::path::Path) -> Result<image::RgbaImage> {
     let (width, height) = ((width * zoom) as u32, (height * zoom) as u32);
     let zoom = zoom as f32;
     // These unwrapped Options are fine as long as the dimensions are correct
-    let mut pixmap = tiny_skia::Pixmap::new(width, height).unwrap();
+    let mut pixmap = Pixmap::new(width, height).unwrap();
 
-    tree.render(
-        tiny_skia::Transform::from_scale(zoom, zoom),
-        &mut pixmap.as_mut(),
-    );
+    tree.render(Transform::from_scale(zoom, zoom), &mut pixmap.as_mut());
 
     Ok(image::RgbaImage::from_raw(width, height, pixmap.take()).unwrap())
 }