update usvg to 0.8

This commit is contained in:
Sebastian K 2019-12-28 11:43:58 +03:00
parent 0662f6433f
commit e38e2d800f
8 changed files with 203 additions and 232 deletions

419
Cargo.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -11,7 +11,7 @@ pf-gl = []
clap = "2.32" clap = "2.32"
gl = "0.6" gl = "0.6"
rayon = "1.0" rayon = "1.0"
usvg = "0.7" usvg = "0.8"
[dependencies.image] [dependencies.image]
version = "0.21" version = "0.21"

View File

@ -7,7 +7,7 @@ authors = ["Alan Jeffrey <ajeffrey@mozilla.com>"]
[dependencies] [dependencies]
gl = "0.6" gl = "0.6"
rayon = "1.0" rayon = "1.0"
usvg = "0.7" usvg = "0.8"
egl = "0.2" egl = "0.2"
log = "0.4" log = "0.4"
smallvec = "0.6" smallvec = "0.6"

View File

@ -6,7 +6,7 @@ authors = ["Patrick Walton <pcwalton@mimiga.net>"]
[dependencies] [dependencies]
bitflags = "1.0" bitflags = "1.0"
usvg = "0.7" usvg = "0.8"
[dependencies.pathfinder_content] [dependencies.pathfinder_content]
path = "../content" path = "../content"

View File

@ -118,7 +118,7 @@ impl BuiltSVG {
&mut self.result_flags, &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 path = Transform2FPathIter::new(path, &transform);
let outline = Outline::from_segments(path); let outline = Outline::from_segments(path);
@ -140,7 +140,7 @@ impl BuiltSVG {
stroke.miterlimit.value() as f32), 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 outline = Outline::from_segments(path);
let mut stroke_to_fill = OutlineStrokeToFill::new(&outline, stroke_style); let mut stroke_to_fill = OutlineStrokeToFill::new(&outline, stroke_style);

View File

@ -9,4 +9,4 @@ edition = "2018"
[dependencies] [dependencies]
pathfinder_export = { path = "../../export" } pathfinder_export = { path = "../../export" }
pathfinder_svg = { path = "../../svg" } pathfinder_svg = { path = "../../svg" }
usvg = "*" usvg = "0.8"

View File

@ -5,4 +5,4 @@ authors = ["Patrick Walton <pcwalton@mimiga.net>"]
edition = "2018" edition = "2018"
[dependencies] [dependencies]
usvg = "0.7" usvg = "0.8"

View File

@ -45,7 +45,7 @@ fn process_node(node: &Node) {
} }
} }
NodeKind::Path(ref path) => { NodeKind::Path(ref path) => {
for segment in path.segments.iter() { for segment in path.data.iter() {
match segment { match segment {
PathSegment::MoveTo { x, y } => println!(" path.moveTo({}, {});", x, y), PathSegment::MoveTo { x, y } => println!(" path.moveTo({}, {});", x, y),
PathSegment::LineTo { x, y } => println!(" path.lineTo({}, {});", x, y), PathSegment::LineTo { x, y } => println!(" path.lineTo({}, {});", x, y),