Update resvg & co.

Cargo.toml

@@ -23,8 +23,8 @@ html5ever = "0.26.0"
 image = "0.24.7"
 clap = { version = "4.3.24", features = ["cargo"] }
 copypasta = "0.10.0"
-resvg = "0.32.0"
-usvg = "0.32.0"
+resvg = "0.33"
+usvg = "0.33"
 tiny-skia = "0.9.1"
 anyhow = "1.0.75"
 dirs = "5.0.1"

src/image/mod.rs

@@ -11,7 +11,7 @@ use std::io;
 use std::path::PathBuf;
 use std::sync::{Arc, Mutex};
 use std::time::Instant;
-use usvg::{TreeParsing, TreeTextToPath};
+use usvg::{Size as UsvgSize, TreeParsing, TreeTextToPath};
 use wgpu::util::DeviceExt;
 use wgpu::{BindGroup, Device, TextureFormat};
 
@@ -208,25 +208,23 @@ impl Image {
  image
  } else {
  let opt = usvg::Options::default();
- let mut rtree = usvg::Tree::from_data(&image_data, &opt).unwrap();
  let mut fontdb = usvg::fontdb::Database::new();
  fontdb.load_system_fonts();
- rtree.convert_text(&fontdb);
- let pixmap_size = rtree.size.to_screen_size();
- let mut pixmap = tiny_skia::Pixmap::new(
- (pixmap_size.width() as f32 * hidpi_scale) as u32,
- (pixmap_size.height() as f32 * hidpi_scale) as u32,
- )
- .context("Couldn't create svg pixmap")
- .unwrap();
- resvg::render(
- &rtree,
- resvg::FitTo::Zoom(hidpi_scale),
- tiny_skia::Transform::default(),
- pixmap.as_mut(),
- )
- .context("Svg failed to render")
- .unwrap();
+ let mut tree = usvg::Tree::from_data(&image_data, &opt).unwrap();
+ tree.size = tree.size.scale_to(
+ UsvgSize::new(
+ tree.size.width() * hidpi_scale as f64,
+ tree.size.height() * hidpi_scale as f64,
+ )
+ .unwrap(),
+ );
+ tree.convert_text(&fontdb);
+ let rtree = resvg::Tree::from_usvg(&tree);
+ let pixmap_size = resvg::IntSize::from_usvg(rtree.size);
+ let mut pixmap = tiny_skia::Pixmap::new(pixmap_size.width(), pixmap_size.height())
+ .context("Couldn't create svg pixmap")
+ .unwrap();
+ rtree.render(tiny_skia::Transform::default(), &mut pixmap.as_mut());
  ImageData::new(
  ImageBuffer::from_raw(pixmap.width(), pixmap.height(), pixmap.data().into())
  .context("Svg buffer has invalid dimensions")