Merge pull request #1907 from alec-deason/master

Update `resvg` to `0.35` and `tiny-skia` to `0.10`

2 files changed, 23 insertions, 11 deletions

diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml
index 15db5b5d..22cfad55 100644
--- a/wgpu/Cargo.toml
+++ b/wgpu/Cargo.toml
@@ -55,7 +55,7 @@ version = "1.0"
 optional = true
 
 [dependencies.resvg]
-version = "0.32"
+version = "0.35"
 optional = true
 
 [dependencies.tracing]
diff --git a/wgpu/src/image/vector.rs b/wgpu/src/image/vector.rs
index 6b9be651..2c03d36b 100644
--- a/wgpu/src/image/vector.rs
+++ b/wgpu/src/image/vector.rs
@@ -114,16 +114,28 @@ impl Cache {
                 // It would be cool to be able to smooth resize the `svg` example.
                 let mut img = tiny_skia::Pixmap::new(width, height)?;
 
-                resvg::render(
-                    tree,
-                    if width > height {
-                        resvg::FitTo::Width(width)
-                    } else {
-                        resvg::FitTo::Height(height)
-                    },
-                    tiny_skia::Transform::default(),
-                    img.as_mut(),
-                )?;
+                let tree_size = tree.size.to_int_size();
+
+                let target_size = if width > height {
+                    tree_size.scale_to_width(width)
+                } else {
+                    tree_size.scale_to_height(height)
+                };
+
+                let transform = if let Some(target_size) = target_size {
+                    let tree_size = tree_size.to_size();
+                    let target_size = target_size.to_size();
+
+                    tiny_skia::Transform::from_scale(
+                        target_size.width() / tree_size.width(),
+                        target_size.height() / tree_size.height(),
+                    )
+                } else {
+                    tiny_skia::Transform::default()
+                };
+
+                resvg::Tree::from_usvg(tree)
+                    .render(transform, &mut img.as_mut());
 
                 let mut rgba = img.take();