diff --git a/Cargo.toml b/Cargo.toml index f9d99f0..2fe2c62 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,21 +9,20 @@ resolver = "2" [dependencies] image = "0.24.3" log = "0.4.14" -hashbrown = "0.11.2" -unicode-width = "0.1.8" -include_dir = "0.6.0" -sha2 = "0.9.8" -tiny-skia = "0.6.3" -resvg = "0.22.0" -usvg = "0.22.0" +hashbrown = "0.12.3" +unicode-width = "0.1.9" +include_dir = "0.7.2" +sha2 = "0.10.2" +tiny-skia = "0.8.0" +resvg = { git = "https://github.com/ghishadow/resvg", branch = "master", version = "0.23.0"} linked-hash-map = "0.5.4" pathfinder_geometry = "0.5.1" -lyon = "0.17.5" -piet = "0.4.0" +lyon = "0.17.10" +piet = "0.5.0" swash = { git = "https://github.com/lapce/swash" } # swash = { path = "../workspaces/swash" } parley = { git = "https://github.com/lapce/parley" } # parley = { path = "../workspaces/parley" } glow = "0.11.2" -glam = "0.10" +glam = "0.21.3" bytemuck = { version = "1.7.2", features = ["derive"] } diff --git a/src/context.rs b/src/context.rs index 0e878c6..c78f80d 100644 --- a/src/context.rs +++ b/src/context.rs @@ -490,6 +490,7 @@ pub enum Brush { Solid(Color), } +#[derive(Clone)] pub struct WgpuImage { pub img: RgbaImage, pub(crate) hash: Vec, diff --git a/src/svg.rs b/src/svg.rs index a2bafc8..8c70735 100644 --- a/src/svg.rs +++ b/src/svg.rs @@ -5,7 +5,7 @@ use glow::HasContext; use linked_hash_map::LinkedHashMap; use piet::kurbo::{Point, Rect, Size}; use sha2::{Digest, Sha256}; - +use resvg::usvg; use crate::context::WgpuImage; #[derive(Clone)] diff --git a/src/transformation.rs b/src/transformation.rs index f343f50..5b337a2 100644 --- a/src/transformation.rs +++ b/src/transformation.rs @@ -8,7 +8,7 @@ pub struct Transformation(Mat4); impl Transformation { /// Get the identity transformation. pub fn identity() -> Transformation { - Transformation(Mat4::identity()) + Transformation(Mat4::IDENTITY) } /// Creates an orthographic projection.