Update Piet to v0.6.1. (#2345)

linebender · Jan 27, 2023 · 5b160d2 · 5b160d2
1 parent ac192be
commit 5b160d2
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/druid-derive/Cargo.toml b/druid-derive/Cargo.toml
@@ -17,7 +17,7 @@ default-target = "x86_64-pc-windows-msvc"
 [dependencies]
 syn = "1.0.107"
 quote = "1.0.23"
-proc-macro2 = "1.0.49"
+proc-macro2 = "1.0.50"
 
 [dev-dependencies]
 druid = { version = "0.7.0", path = "../druid" }

diff --git a/druid-shell/Cargo.toml b/druid-shell/Cargo.toml
@@ -63,7 +63,7 @@ serde = ["kurbo/serde"]
 [dependencies]
 # NOTE: When changing the piet or kurbo versions, ensure that
 #       the kurbo version included in piet is compatible with the kurbo version specified here.
-piet-common = "0.6.0"
+piet-common = "0.6.1"
 kurbo = "0.9.0"
 
 tracing = "0.1.37"
@@ -127,7 +127,7 @@ version = "0.3.60"
 features = ["Window", "MouseEvent", "CssStyleDeclaration", "WheelEvent", "KeyEvent", "KeyboardEvent", "Navigator"]
 
 [dev-dependencies]
-piet-common = { version = "0.6.0", features = ["png"] }
+piet-common = { version = "0.6.1", features = ["png"] }
 static_assertions = "1.1.0"
 test-log = { version = "0.2.11", features = ["trace"], default-features = false }
 tracing-subscriber = { version = "0.3.16", features = ["env-filter"] }

diff --git a/druid/Cargo.toml b/druid/Cargo.toml
@@ -71,8 +71,8 @@ instant = { version = "0.1.12", features = ["wasm-bindgen"] }
 # Optional dependencies
 chrono = { version = "0.4.23", optional = true }
 im = { version = "15.1.0", optional = true }
-resvg = { version = "0.28.0", optional = true }
-usvg =  { version = "0.28.0", optional = true }
+resvg = { version = "0.25.0", optional = true } # When updating, make sure it doesn't pin a specific `png` crate, see druid#2345
+usvg =  { version = "0.25.0", optional = true }
 tiny-skia = { version = "0.8.2", optional = true }
 
 [target.'cfg(target_arch="wasm32")'.dependencies]
@@ -82,7 +82,7 @@ console_error_panic_hook = { version = "0.1.7" }
 [dev-dependencies]
 float-cmp = { version = "0.9.0", features = ["std"], default-features = false }
 tempfile = "3.3.0"
-piet-common = { version = "0.6.0", features = ["png"] }
+piet-common = { version = "0.6.1", features = ["png"] }
 pulldown-cmark = { version = "0.8.0", default-features = false }
 test-log = { version = "0.2.11", features = ["trace"], default-features = false }
 # test-env-log needs it

diff --git a/druid/src/widget/svg.rs b/druid/src/widget/svg.rs
@@ -152,7 +152,7 @@ impl std::str::FromStr for SvgData {
             ..usvg::Options::default()
         };
 
-        match Tree::from_str(svg_str, &re_opt) {
+        match Tree::from_str(svg_str, &re_opt.to_ref()) {
             Ok(tree) => Ok(SvgData::new(Arc::new(tree))),
             Err(err) => Err(err.into()),
         }