Merge pull request rust-windowing#246 from s3bk/usvg_0.8

pcwalton · web-flow · commit dcefd7b70b09 · 2019-12-29T11:29:09.000-08:00
update usvg to 0.8
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/demo/common/Cargo.toml b/demo/common/Cargo.toml
@@ -11,7 +11,7 @@ pf-gl = []
 clap = "2.32"
 gl = "0.6"
 rayon = "1.0"
-usvg = "0.7"
+usvg = "0.8"
 
 [dependencies.image]
 version = "0.21"
diff --git a/demo/magicleap/Cargo.toml b/demo/magicleap/Cargo.toml
@@ -7,7 +7,7 @@ authors = ["Alan Jeffrey <ajeffrey@mozilla.com>"]
 [dependencies]
 gl = "0.6"
 rayon = "1.0"
-usvg = "0.7"
+usvg = "0.8"
 egl = "0.2"
 log = "0.4"
 smallvec = "0.6"
diff --git a/svg/Cargo.toml b/svg/Cargo.toml
@@ -6,7 +6,7 @@ authors = ["Patrick Walton <pcwalton@mimiga.net>"]
 
 [dependencies]
 bitflags = "1.0"
-usvg = "0.7"
+usvg = "0.8"
 
 [dependencies.pathfinder_content]
 path = "../content"
diff --git a/svg/src/lib.rs b/svg/src/lib.rs
@@ -118,7 +118,7 @@ impl BuiltSVG {
                         &mut self.result_flags,
                     ));
 
-                    let path = UsvgPathToSegments::new(path.segments.iter().cloned());
+                    let path = UsvgPathToSegments::new(path.data.iter().cloned());
                     let path = Transform2FPathIter::new(path, &transform);
                     let outline = Outline::from_segments(path);
 
@@ -140,7 +140,7 @@ impl BuiltSVG {
                                                                  stroke.miterlimit.value() as f32),
                     };
 
-                    let path = UsvgPathToSegments::new(path.segments.iter().cloned());
+                    let path = UsvgPathToSegments::new(path.data.iter().cloned());
                     let outline = Outline::from_segments(path);
 
                     let mut stroke_to_fill = OutlineStrokeToFill::new(&outline, stroke_style);
diff --git a/utils/convert/Cargo.toml b/utils/convert/Cargo.toml
@@ -9,4 +9,4 @@ edition = "2018"
 [dependencies]
 pathfinder_export = { path = "../../export" }
 pathfinder_svg = { path = "../../svg" }
-usvg = "*"
+usvg = "0.8"
diff --git a/utils/svg-to-skia/Cargo.toml b/utils/svg-to-skia/Cargo.toml
@@ -5,4 +5,4 @@ authors = ["Patrick Walton <pcwalton@mimiga.net>"]
 edition = "2018"
 
 [dependencies]
-usvg = "0.7"
+usvg = "0.8"
diff --git a/utils/svg-to-skia/src/main.rs b/utils/svg-to-skia/src/main.rs
@@ -45,7 +45,7 @@ fn process_node(node: &Node) {
             }
         }
         NodeKind::Path(ref path) => {
-            for segment in path.segments.iter() {
+            for segment in path.data.iter() {
                 match segment {
                     PathSegment::MoveTo { x, y } => println!("    path.moveTo({}, {});", x, y),
                     PathSegment::LineTo { x, y } => println!("    path.lineTo({}, {});", x, y),

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ fn process_node(node: &Node) {`
`45`	`45`	`}`
`46`	`46`	`}`
`47`	`47`	`NodeKind::Path(ref path) => {`
`48`		`- for segment in path.segments.iter() {`
	`48`	`+ for segment in path.data.iter() {`
`49`	`49`	`match segment {`
`50`	`50`	`PathSegment::MoveTo { x, y } => println!(" path.moveTo({}, {});", x, y),`
`51`	`51`	`PathSegment::LineTo { x, y } => println!(" path.lineTo({}, {});", x, y),`