From 5aaf288d1ca6485be743f3d75ce80a5625945358 Mon Sep 17 00:00:00 2001
From: msiglreith <m.siglreith@gmail.com>
Date: Wed, 8 Mar 2023 19:06:46 +0100
Subject: [PATCH 1/2] vello_svg: Use affine transformation instead of
 transforming the path data

Correctly apply the transformation for other parameters as well (e.g stroke width)
---
 integrations/vello_svg/src/lib.rs | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/integrations/vello_svg/src/lib.rs b/integrations/vello_svg/src/lib.rs
index 312c747..f40d650 100644
--- a/integrations/vello_svg/src/lib.rs
+++ b/integrations/vello_svg/src/lib.rs
@@ -65,6 +65,14 @@ pub fn render_tree_with<F: FnMut(&mut SceneBuilder, &usvg::Node) -> Result<(), E
 ) -> Result<(), E> {
     for elt in svg.root.descendants() {
         let transform = elt.abs_transform();
+        let transform = Affine::new([
+            transform.a,
+            transform.b,
+            transform.c,
+            transform.d,
+            transform.e,
+            transform.f,
+        ]);
         match &*elt.borrow() {
             usvg::NodeKind::Group(_) => {}
             usvg::NodeKind::Path(path) => {
@@ -72,7 +80,7 @@ pub fn render_tree_with<F: FnMut(&mut SceneBuilder, &usvg::Node) -> Result<(), E
                 // The semantics of SVG paths don't line up with `BezPath`; we must manually track initial points
                 let mut just_closed = false;
                 let mut most_recent_initial = (0., 0.);
-                for elt in usvg::TransformedPath::new(&path.data, transform) {
+                for elt in path.data.segments() {
                     match elt {
                         usvg::PathSegment::MoveTo { x, y } => {
                             if std::mem::take(&mut just_closed) {
@@ -112,7 +120,7 @@ pub fn render_tree_with<F: FnMut(&mut SceneBuilder, &usvg::Node) -> Result<(), E
                 if let Some(fill) = &path.fill {
                     if let Some(brush) = paint_to_brush(&fill.paint, fill.opacity) {
                         // FIXME: Set the fill rule
-                        sb.fill(Fill::NonZero, Affine::IDENTITY, &brush, None, &local_path);
+                        sb.fill(Fill::NonZero, transform, &brush, None, &local_path);
                     } else {
                         on_err(sb, &elt)?;
                     }
@@ -122,7 +130,7 @@ pub fn render_tree_with<F: FnMut(&mut SceneBuilder, &usvg::Node) -> Result<(), E
                         // FIXME: handle stroke options such as linecap, linejoin, etc.
                         sb.stroke(
                             &Stroke::new(stroke.width.get() as f32),
-                            Affine::IDENTITY,
+                            transform,
                             &brush,
                             None,
                             &local_path,

From 6c4194848f0202a1620724733099698dead21a3b Mon Sep 17 00:00:00 2001
From: msiglreith <m.siglreith@gmail.com>
Date: Thu, 9 Mar 2023 18:45:56 +0100
Subject: [PATCH 2/2] improve code formatting

---
 integrations/vello_svg/src/lib.rs | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/integrations/vello_svg/src/lib.rs b/integrations/vello_svg/src/lib.rs
index f40d650..894f812 100644
--- a/integrations/vello_svg/src/lib.rs
+++ b/integrations/vello_svg/src/lib.rs
@@ -64,15 +64,10 @@ pub fn render_tree_with<F: FnMut(&mut SceneBuilder, &usvg::Node) -> Result<(), E
     mut on_err: F,
 ) -> Result<(), E> {
     for elt in svg.root.descendants() {
-        let transform = elt.abs_transform();
-        let transform = Affine::new([
-            transform.a,
-            transform.b,
-            transform.c,
-            transform.d,
-            transform.e,
-            transform.f,
-        ]);
+        let transform = {
+            let usvg::Transform { a, b, c, d, e, f } = elt.abs_transform();
+            Affine::new([a, b, c, d, e, f])
+        };
         match &*elt.borrow() {
             usvg::NodeKind::Group(_) => {}
             usvg::NodeKind::Path(path) => {