diff --git a/Cargo.lock b/Cargo.lock index 78350837..4f18eeb0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5,10 +5,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "aho-corasick" -version = "0.6.9" +version = "0.6.10" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "memchr 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -24,7 +24,7 @@ name = "area-lut" version = "0.2.0" dependencies = [ "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.19.4 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.19.5 (registry+https://github.com/rust-lang/crates.io-index)", "image 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -41,14 +41,14 @@ name = "atty" version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", "termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "autocfg" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -56,7 +56,7 @@ name = "base64" version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "safemem 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -67,12 +67,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "byteorder" -version = "1.2.7" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "cc" -version = "1.0.28" +version = "1.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -152,7 +152,7 @@ version = "0.7.19" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "adler32 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -181,12 +181,23 @@ dependencies = [ [[package]] name = "euclid" -version = "0.19.4" +version = "0.19.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ + "euclid_macros 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "euclid_macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "fixedbitset" version = "0.1.9" @@ -206,17 +217,8 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] -name = "fuchsia-zircon" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", - "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "fuchsia-zircon-sys" -version = "0.3.3" +name = "fuchsia-cprng" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -262,10 +264,10 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -282,11 +284,11 @@ name = "image" version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "gif 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", "jpeg-decoder 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", "lzw 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", - "num-derive 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "num-derive 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "num-iter 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", "num-rational 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -299,7 +301,7 @@ name = "image" version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "lzw 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", "num-iter 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", "num-rational 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -310,7 +312,7 @@ dependencies = [ [[package]] name = "inflate" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "adler32 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -326,9 +328,9 @@ name = "jemalloc-sys" version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.29 (registry+https://github.com/rust-lang/crates.io-index)", "fs_extra 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -337,7 +339,7 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "jemalloc-sys 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -345,7 +347,7 @@ name = "jpeg-decoder" version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "rayon 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -361,16 +363,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "libc" -version = "0.2.46" +version = "0.2.48" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "libflate" -version = "0.1.19" +version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "adler32 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "crc32fast 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -392,22 +394,14 @@ dependencies = [ [[package]] name = "lyon_geom" -version = "0.12.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.19.4 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.19.5 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "lyon_path" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "lyon_geom 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "lzw" version = "0.10.0" @@ -415,13 +409,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "memchr" -version = "2.1.2" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", - "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -] [[package]] name = "memoffset" @@ -453,13 +442,12 @@ dependencies = [ [[package]] name = "num-derive" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", - "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.15.24 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -504,10 +492,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "num_cpus" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -515,7 +503,6 @@ name = "pathfinder_demo" version = "0.1.0" dependencies = [ "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.19.4 (registry+https://github.com/rust-lang/crates.io-index)", "gl 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", "jemallocator 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", "nfd 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -534,40 +521,37 @@ version = "0.3.0" dependencies = [ "arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.19.4 (registry+https://github.com/rust-lang/crates.io-index)", "pathfinder_simd 0.3.0", - "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "pathfinder_gl" version = "0.1.0" dependencies = [ - "euclid 0.19.4 (registry+https://github.com/rust-lang/crates.io-index)", "gl 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", "image 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", "pathfinder_geometry 0.3.0", "pathfinder_renderer 0.1.0", - "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "pathfinder_renderer" version = "0.1.0" dependencies = [ - "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.19.4 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "fixedbitset 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", - "hashbrown 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", + "hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "pathfinder_geometry 0.3.0", "pathfinder_simd 0.3.0", "quickcheck 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", "rayon 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -578,7 +562,6 @@ version = "0.3.0" name = "pathfinder_svg" version = "0.1.0" dependencies = [ - "lyon_path 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "pathfinder_geometry 0.3.0", "pathfinder_renderer 0.1.0", "usvg 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -607,7 +590,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "deflate 0.7.19 (registry+https://github.com/rust-lang/crates.io-index)", - "inflate 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", + "inflate 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", "num-iter 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -618,13 +601,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "deflate 0.7.19 (registry+https://github.com/rust-lang/crates.io-index)", - "inflate 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", + "inflate 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", "num-iter 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "proc-macro2" -version = "0.4.24" +version = "0.4.27" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -642,42 +625,43 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "env_logger 0.5.13 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "quote" -version = "0.6.10" +version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "rand" -version = "0.5.5" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_core 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "rand" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "autocfg 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", + "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_os 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_jitter 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_os 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "rand_pcg 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -688,8 +672,8 @@ name = "rand_chacha" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "autocfg 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -697,12 +681,20 @@ name = "rand_core" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "rand_core" -version = "0.3.0" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "rand_core" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -710,7 +702,7 @@ name = "rand_hc" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -718,18 +710,28 @@ name = "rand_isaac" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "rand_jitter" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "rand_os" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -739,7 +741,7 @@ name = "rand_pcg" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -748,7 +750,7 @@ name = "rand_xorshift" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -768,8 +770,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "crossbeam-deque 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", - "num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", + "num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -782,12 +784,12 @@ name = "rdrand" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "redox_syscall" -version = "0.1.50" +version = "0.1.51" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -795,7 +797,7 @@ name = "redox_termios" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "redox_syscall 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)", + "redox_syscall 0.1.51 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -803,16 +805,16 @@ name = "regex" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "aho-corasick 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)", - "memchr 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "regex-syntax 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "aho-corasick 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", + "memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "regex-syntax 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "regex-syntax" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "ucd-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -866,9 +868,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", "num 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", "sdl2-sys 0.32.5 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -895,27 +897,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "serde" -version = "1.0.84" +version = "1.0.88" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "serde_derive" -version = "1.0.84" +version = "1.0.88" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.15.24 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "serde_json" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "ryu 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -930,16 +932,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "slab" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "smallvec" -version = "0.6.8" +version = "0.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -] [[package]] name = "strsim" @@ -954,7 +953,7 @@ dependencies = [ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "roxmltree 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "simplecss 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "slab 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", + "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "svgtypes 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -969,11 +968,11 @@ dependencies = [ [[package]] name = "syn" -version = "0.15.24" +version = "0.15.26" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -990,8 +989,8 @@ name = "termion" version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", - "redox_syscall 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", + "redox_syscall 0.1.51 (registry+https://github.com/rust-lang/crates.io-index)", "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1016,17 +1015,16 @@ name = "tile-svg" version = "0.1.0" dependencies = [ "arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", - "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.19.4 (registry+https://github.com/rust-lang/crates.io-index)", "fixedbitset 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", - "hashbrown 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", + "hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "jemallocator 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", "pathfinder_geometry 0.3.0", "pathfinder_renderer 0.1.0", "pathfinder_svg 0.1.0", "quickcheck 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "rayon 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "svgtypes 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "usvg 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1052,23 +1050,15 @@ name = "unicode-xid" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "unreachable" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "usvg" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", - "libflate 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)", + "libflate 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "lyon_geom 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)", + "lyon_geom 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)", "rctree 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "svgdom 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-segmentation 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1084,16 +1074,6 @@ name = "vec_map" version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "version_check" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "void" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "winapi" version = "0.3.6" @@ -1110,7 +1090,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "winapi-util" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1127,7 +1107,7 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi-util 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1145,15 +1125,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [metadata] "checksum adler32 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7e522997b529f05601e05166c07ed17789691f562762c7f3b987263d2dedee5c" -"checksum aho-corasick 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)" = "1e9a933f4e58658d7b12defcf96dc5c720f20832deebe3e0a19efd3b6aaeeb9e" +"checksum aho-corasick 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "81ce3d38065e618af2d7b77e10c5ad9a069859b4be3c2250f674af3840d9c8a5" "checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" "checksum arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "92c7fb76bc8826a8b33b4ee5bb07a247a81e76764ab4d55e8f73e3a4d8808c71" "checksum atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9a7d5b8723950951411ee34d271d99dddcc2035a16ab25310ea2c8cfd4369652" -"checksum autocfg 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4e5f34df7a019573fb8bdc7e24a2bfebe51a2a1d6bfdbaeccedb3c41fc574727" +"checksum autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a6d640bee2da49f60a4068a7fae53acde8982514ab7bae8b8cea9e88cbcfd799" "checksum base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643" "checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12" -"checksum byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "94f88df23a25417badc922ab0f5716cc1330e87f71ddd9203b3a3ccd9cedf75d" -"checksum cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4a8b715cb4597106ea87c7c84b2f1d452c7492033765df7f32651e66fcf749" +"checksum byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a019b10a2a7cdeb292db131fc8113e57ea2a908f6e7894b0c3c671893b65dbeb" +"checksum cc 1.0.29 (registry+https://github.com/rust-lang/crates.io-index)" = "4390a3b5f4f6bce9c1d0c00128379df433e53777fdd30e92f16a529332baec4e" "checksum cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "082bb9b28e00d3c9d39cc03e64ce4cea0f1bb9b3fde493f0cbc008472d22bdf4" "checksum clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b957d88f4b6a63b9d70d5f454ac8011819c6efa7727858f458ab71c756ce2d3e" "checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" @@ -1165,72 +1145,73 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum deflate 0.7.19 (registry+https://github.com/rust-lang/crates.io-index)" = "8a6abb26e16e8d419b5c78662aa9f82857c2386a073da266840e474d5055ec86" "checksum either 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3be565ca5c557d7f59e7cfcf1844f9e3033650c929c6566f511e8005f205c1d0" "checksum env_logger 0.5.13 (registry+https://github.com/rust-lang/crates.io-index)" = "15b0a4d2e39f8420210be8b27eeda28029729e2fd4291019455016c348240c38" -"checksum euclid 0.19.4 (registry+https://github.com/rust-lang/crates.io-index)" = "dbbf962bb6f877239a34491f2e0a12c6b824f389bc789eb90f1d70d4780b0727" +"checksum euclid 0.19.5 (registry+https://github.com/rust-lang/crates.io-index)" = "d1a7698bdda3d7444a79d33bdc96e8b518d44ea3ff101d8492a6ca1207b886ea" +"checksum euclid_macros 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fdcb84c18ea5037a1c5a23039b4ff29403abce2e0d6b1daa11cf0bde2b30be15" "checksum fixedbitset 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "86d4de0081402f5e88cdac65c8dcdcc73118c1a7a465e2a05f0da05843a8ea33" "checksum float-cmp 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "134a8fa843d80a51a5b77d36d42bc2def9edcb0262c914861d08129fd1926600" "checksum fs_extra 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5f2a4a2034423744d2cc7ca2068453168dcdb82c438419e639a26bd87839c674" -"checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" -"checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" +"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" "checksum gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)" = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2" "checksum gif 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dd4bca55ac1f213920ce3527ccd62386f1f15fa3f1714aeee1cf93f2c416903f" "checksum gl 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "1c73b90c285f02059b34a6c66bc645ba5faa18c0e3ab332e0725654fc71db441" "checksum gl_generator 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "75d69f914b49d9ff32fdf394cbd798f8c716d74fd19f9cc29da3e99797b2a78d" -"checksum hashbrown 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "64b7d419d0622ae02fe5da6b9a5e1964b610a65bb37923b976aeebb6dbb8f86e" +"checksum hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3bae29b6653b3412c2e71e9d486db9f9df5d701941d86683005efb9f2d28e3da" "checksum humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3ca7e5f2e110db35f93b837c81797f3714500b81d517bf20c431b16d3ca4f114" "checksum image 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ebdff791af04e30089bde8ad2a632b86af433b40c04db8d70ad4b21487db7a6a" "checksum image 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)" = "52fb0666a1273dac46f9725aa4859bcd5595fc3554cf3495051b4de8db745e7d" -"checksum inflate 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "84c683bde2d8413b8f1be3e459c30e4817672b6e7a31d9212b0323154e76eba7" +"checksum inflate 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "1cdb29978cc5797bd8dcc8e5bf7de604891df2a8dc576973d71a281e916db2ff" "checksum itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1306f3464951f30e30d12373d31c79fbd52d236e5e896fd92f96ec7babbbe60b" "checksum jemalloc-sys 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "bfc62c8e50e381768ce8ee0428ee53741929f7ebd73e4d83f669bcf7693e00ae" "checksum jemallocator 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "9f0cd42ac65f758063fea55126b0148b1ce0a6354ff78e07a4d6806bc65c4ab3" "checksum jpeg-decoder 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "c8b7d43206b34b3f94ea9445174bda196e772049b9bddbc620c9d29b2d20110d" "checksum khronos_api 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "037ab472c33f67b5fbd3e9163a2645319e5356fcd355efa6d4eb7fff4bbcb554" "checksum lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a374c89b9db55895453a74c1e38861d9deec0b01b405a82516e9d5de4820dea1" -"checksum libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)" = "023a4cd09b2ff695f9734c1934145a315594b7986398496841c7031a5a1bbdbd" -"checksum libflate 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)" = "bff3ac7d6f23730d3b533c35ed75eef638167634476a499feef16c428d74b57b" +"checksum libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)" = "e962c7641008ac010fa60a7dfdc1712449f29c44ef2d4702394aea943ee75047" +"checksum libflate 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)" = "54d1ddf9c52870243c5689d7638d888331c1116aa5b398f3ba1acfa7d8758ca1" "checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" "checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6" -"checksum lyon_geom 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0f181b2b51b8f2edd7b37a97718e848933dcc7420c8cde081ba95dbb475b6975" -"checksum lyon_path 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e9dc8e0746b7cca11960b602f7fe037bb067746a01eab4aa502fed1494544843" +"checksum lyon_geom 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2b60eaa9061c87affcd671e88289ce6971324269ec6548b677e02624ef3ef63c" "checksum lzw 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7d947cbb889ed21c2a84be6ffbaebf5b4e0f4340638cba0444907e38b56be084" -"checksum memchr 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "db4c41318937f6e76648f42826b1d9ade5c09cafb5aef7e351240a70f39206e9" +"checksum memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2efc7bc57c883d4a4d6e3246905283d8dae951bb3bd32f49d6ef297f546e1c39" "checksum memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0f9dc261e2b62d7a622bf416ea3c5245cdd5d9a7fcc428c0d06804dfce1775b3" "checksum nfd 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8e752e3c216bc8a491c5b59fa46da10f1379ae450b19ac688e07f4bb55042e98" "checksum nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9667ddcc6cc8a43afc9b7917599d7216aa09c463919ea32c59ed6cac8bc945" "checksum num 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "4703ad64153382334aa8db57c637364c322d3372e097840c72000dabdcf6156e" -"checksum num-derive 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8af1847c907c2f04d7bfd572fb25bbb4385c637fe5be163cf2f8c5d778fe1e7d" +"checksum num-derive 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "d9fe8fcafd1b86a37ce8a1cfa15ae504817e0c8c2e7ad42767371461ac1d316d" "checksum num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "e83d528d2677f0518c570baf2b7abdcf0cd2d248860b68507bdcb3e91d4c0cea" "checksum num-iter 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)" = "af3fdbbc3291a5464dc57b03860ec37ca6bf915ed6ee385e7c6c052c422b2124" "checksum num-rational 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "ee314c74bd753fc86b4780aa9475da469155f3848473a261d2d18e35245a784e" "checksum num-rational 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4e96f040177bb3da242b5b1ecf3f54b5d5af3efbbfb18608977a5d2767b22f10" "checksum num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0b3a5d7cc97d6d30d8b9bc8fa19bf45349ffe46241e8816f50f62f6d6aaabee1" -"checksum num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5a69d464bdc213aaaff628444e99578ede64e9c854025aa43b9796530afa9238" +"checksum num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1a23f0ed30a54abaa0c7e83b1d2d87ada7c3c23078d1d87815af3e3b6385fbba" "checksum phf 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b3da44b85f8e8dfaec21adae67f95d93244b2ecf6ad2a692320598dcc8e6dd18" "checksum phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0" "checksum png 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f54b9600d584d3b8a739e1662a595fab051329eff43f20e7d8cc22872962145b" "checksum png 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9adebf7fb91ccf5eac9da1a8e00e83cb8ae882c3e8d8e4ad59da73cb8c82a2c9" -"checksum proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)" = "77619697826f31a02ae974457af0b29b723e5619e113e9397b8b82c6bd253f09" +"checksum proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)" = "4d317f9caece796be1980837fd5cb3dfec5613ebdb04ad0956deea83ce168915" "checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0" "checksum quickcheck 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d4537d3e4edf73a15dd059b75bed1c292d17d3ea7517f583cebe716794fcf816" -"checksum quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "53fa22a1994bd0f9372d7a816207d8a2677ad0325b073f5c5332760f0fb62b5c" -"checksum rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e464cd887e869cddcae8792a4ee31d23c7edd516700695608f5b98c67ee0131c" -"checksum rand 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "3906503e80ac6cbcacb2c2973fa8e473f24d7e2747c8c92bb230c2441cad96b5" +"checksum quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)" = "cdd8e04bd9c52e0342b406469d494fcb033be4bdbe5c606016defbb1681411e1" +"checksum rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9" +"checksum rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" "checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" "checksum rand_core 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1961a422c4d189dfb50ffa9320bf1f2a9bd54ecb92792fb9477f99a1045f3372" -"checksum rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0905b6b7079ec73b314d4c748701f6931eb79fd97c668caa3f1899b22b32c6db" +"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" +"checksum rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d0e7a549d590831370895ab7ba4ea0c1b6b011d106b5ff2da6eee112615e6dc0" "checksum rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" "checksum rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" -"checksum rand_os 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f46fbd5550acf75b0c2730f5dd1873751daf9beb8f11b44027778fae50d7feca" +"checksum rand_jitter 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b9ea758282efe12823e0d952ddb269d2e1897227e464919a554f2a03ef1b832" +"checksum rand_os 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b7c690732391ae0abafced5015ffb53656abfaec61b342290e5eb56b286a679d" "checksum rand_pcg 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "086bd09a33c7044e56bb44d5bdde5a60e7f119a9e95b0775f545de759a32fe05" "checksum rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" "checksum rayon 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "373814f27745b2686b350dd261bfd24576a6fb0e2c5919b3a2b6005f820b0473" "checksum rayon-core 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b055d1e92aba6877574d8fe604a63c8b5df60f60e5982bf7ccbb1338ea527356" "checksum rctree 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1817e0f0056f95bce0d6ab1a5be62ca24bd756b5547c20637ef47cc9a2065f4b" "checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" -"checksum redox_syscall 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)" = "52ee9a534dc1301776eff45b4fa92d2c39b1d8c3d3357e6eb593e0d795506fc2" +"checksum redox_syscall 0.1.51 (registry+https://github.com/rust-lang/crates.io-index)" = "423e376fffca3dfa06c9e9790a9ccd282fafb3cc6e6397d01dbf64f9bacc6b85" "checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76" "checksum regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "37e7cbbd370869ce2e8dff25c7018702d10b21a20ef7135316f8daecd6c25b7f" -"checksum regex-syntax 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4e47a2ed29da7a9e1960e1639e7a982e6edc6d49be308a3b02daf511504a16d1" +"checksum regex-syntax 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "8c2f35eedad5295fdf00a63d7d4b238135723f92b434ec06774dad15c7ab0861" "checksum roxmltree 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "02660467d0c2da1b6276042501aee6e15ec5b8ff59423243f185b294cd53acf3" "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" "checksum ryu 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "eb9e9b8cde282a9fe6a42dd4681319bfb63f121b8a8ee9439c6f4107e58a46f7" @@ -1242,17 +1223,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum sdl2-sys 0.32.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e82803e85c2e6178d28886cef25b2c53afc2eecaeff739f2247f23ed3352e6c1" "checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" "checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" -"checksum serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)" = "0e732ed5a5592c17d961555e3b552985baf98d50ce418b7b655f31f6ba7eb1b7" -"checksum serde_derive 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)" = "b4d6115a3ca25c224e409185325afc16a0d5aaaabc15c42b09587d6f1ba39a5b" -"checksum serde_json 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)" = "4b90a9fbe1211e57d3e1c15670f1cb00802988fb23a1a4aad7a2b63544f1920e" +"checksum serde 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)" = "9f301d728f2b94c9a7691c90f07b0b4e8a4517181d9461be94c04bddeb4bd850" +"checksum serde_derive 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)" = "beed18e6f5175aef3ba670e57c60ef3b1b74d250d962a26604bff4c80e970dd4" +"checksum serde_json 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)" = "27dce848e7467aa0e2fcaf0a413641499c0b745452aaca1194d24dedde9e13c9" "checksum simplecss 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "135685097a85a64067df36e28a243e94a94f76d829087ce0be34eeb014260c0e" "checksum siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac" -"checksum slab 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5f9776d6b986f77b35c6cf846c11ad986ff128fe0b2b63a3628e3755e8d3102d" -"checksum smallvec 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)" = "88aea073965ab29f6edb5493faf96ad662fb18aa9eeb186a3b7057951605ed15" +"checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" +"checksum smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)" = "c4488ae950c49d403731982257768f48fada354a5203fe81f9bb6f43ca9002be" "checksum strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4f380125926a99e52bc279241539c018323fab05ad6368b56f93d9369ff550" "checksum svgdom 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a9b53b3ed152fc6b871f7232a8772c640567fd25d056941450637ecba32924d" "checksum svgtypes 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c43c25e6de7264024b5e351eb0c342039eb5acf51f2e9d0099bbd324b661453b" -"checksum syn 0.15.24 (registry+https://github.com/rust-lang/crates.io-index)" = "734ecc29cd36e8123850d9bf21dfd62ef8300aaa8f879aabaa899721808be37c" +"checksum syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)" = "f92e629aa1d9c827b2bb8297046c1ccffc57c99b947a680d3ccff1f136a3bee9" "checksum termcolor 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4096add70612622289f2fdcdbd5086dc81c1e2675e6ae58d6c4f62a16c6d7f2f" "checksum termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096" "checksum textwrap 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "307686869c93e71f94da64286f9a9524c0f308a9e1c87a583de8e9c9039ad3f6" @@ -1261,15 +1242,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum unicode-segmentation 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "aa6024fc12ddfd1c6dbc14a80fa2324d4568849869b779f6bd37e5e4c03344d1" "checksum unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526" "checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" -"checksum unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56" "checksum usvg 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f9ebf4d5244ba2e8305caf9de7949377794ecdea5a9e3c84fc5610d78d21f5ee" "checksum utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "796f7e48bef87609f7ade7e06495a87d5cd06c7866e6a5cbfceffc558a243737" "checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" -"checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" -"checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" "checksum winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "92c1eb33641e276cfa214a0522acad57be5c56b10cb348b3c5117db75f3ac4b0" "checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" -"checksum winapi-util 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "afc5508759c5bf4285e61feb862b6083c8480aec864fa17a81fdec6f69b461ab" +"checksum winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7168bab6e1daee33b4557efd0e95d5ca70a03706d39fa5f3fe7a236f584b03c9" "checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" "checksum wincolor 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "561ed901ae465d6185fa7864d63fbd5720d0ef718366c9a4dc83cf6170d7e9ba" "checksum xml-rs 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3c1cb601d29fe2c2ac60a2b2e5e293994d87a1f6fa9687a31a15270f909be9c2" diff --git a/demo/common/Cargo.toml b/demo/common/Cargo.toml index 36269ff2..f9034c01 100644 --- a/demo/common/Cargo.toml +++ b/demo/common/Cargo.toml @@ -6,7 +6,6 @@ authors = ["Patrick Walton "] [dependencies] clap = "2.32" -euclid = "0.19" gl = "0.6" jemallocator = "0.1" nfd = "0.0.4" diff --git a/demo/common/src/lib.rs b/demo/common/src/lib.rs index 88392e65..63a4a1a5 100644 --- a/demo/common/src/lib.rs +++ b/demo/common/src/lib.rs @@ -12,7 +12,6 @@ use crate::ui::{DemoUI, UIAction, UIEvent}; use clap::{App, Arg}; -use euclid::Size2D; use gl::types::GLsizei; use jemallocator; use pathfinder_geometry::basic::point::{Point2DF32, Point2DI32, Point3DF32}; @@ -129,10 +128,10 @@ impl DemoApp { let (window_width, _) = window.size(); let (drawable_width, drawable_height) = window.drawable_size(); - let drawable_size = Size2D::new(drawable_width, drawable_height); + let drawable_size = Point2DI32::new(drawable_width as i32, drawable_height as i32); let base_scene = load_scene(&options.input_path); - let renderer = Renderer::new(&device, &drawable_size); + let renderer = Renderer::new(&device, drawable_size); let scene_thread_proxy = SceneThreadProxy::new(base_scene, options.clone()); update_drawable_size(&window, &scene_thread_proxy); @@ -239,7 +238,7 @@ impl DemoApp { Event::Window { win_event: WindowEvent::SizeChanged(..), .. } => { let drawable_size = update_drawable_size(&self.window, &self.scene_thread_proxy); - self.renderer.set_main_framebuffer_size(&drawable_size); + self.renderer.set_main_framebuffer_size(drawable_size); self.dirty = true; } Event::MouseButtonDown { x, y, .. } => { @@ -511,8 +510,8 @@ impl SceneThreadProxy { self.sender.send(MainToSceneMsg::LoadScene(scene)).unwrap(); } - fn set_drawable_size(&self, drawable_size: &Size2D) { - self.sender.send(MainToSceneMsg::SetDrawableSize(*drawable_size)).unwrap(); + fn set_drawable_size(&self, drawable_size: Point2DI32) { + self.sender.send(MainToSceneMsg::SetDrawableSize(drawable_size)).unwrap(); } } @@ -536,9 +535,7 @@ impl SceneThread { match msg { MainToSceneMsg::LoadScene(scene) => self.scene = scene, MainToSceneMsg::SetDrawableSize(size) => { - self.scene.view_box = - RectF32::new(Point2DF32::default(), - Point2DF32::new(size.width as f32, size.height as f32)); + self.scene.view_box = RectF32::new(Point2DF32::default(), size.to_f32()); } MainToSceneMsg::Build(build_options) => { let start_time = Instant::now(); @@ -553,7 +550,7 @@ impl SceneThread { enum MainToSceneMsg { LoadScene(Scene), - SetDrawableSize(Size2D), + SetDrawableSize(Point2DI32), Build(BuildOptions), } @@ -672,10 +669,10 @@ fn build_scene(scene: &Scene, build_options: BuildOptions, jobs: Option) built_scene } -fn update_drawable_size(window: &Window, scene_thread_proxy: &SceneThreadProxy) -> Size2D { +fn update_drawable_size(window: &Window, scene_thread_proxy: &SceneThreadProxy) -> Point2DI32 { let (drawable_width, drawable_height) = window.drawable_size(); - let drawable_size = Size2D::new(drawable_width as u32, drawable_height as u32); - scene_thread_proxy.set_drawable_size(&drawable_size); + let drawable_size = Point2DI32::new(drawable_width as i32, drawable_height as i32); + scene_thread_proxy.set_drawable_size(drawable_size); drawable_size } @@ -745,8 +742,7 @@ impl CameraTransform3D { transform.post_mul(&Transform3DF32::from_translation(0.0, -WORLD_SCALE, 0.0)); } - let drawable_size = Size2D::new(drawable_size.x() as u32, drawable_size.y() as u32); - Perspective::new(&transform, &drawable_size) + Perspective::new(&transform, drawable_size) } } diff --git a/demo/common/src/ui.rs b/demo/common/src/ui.rs index 1ad71c15..9d0eb02c 100644 --- a/demo/common/src/ui.rs +++ b/demo/common/src/ui.rs @@ -86,7 +86,7 @@ impl DemoUI { } pub fn update(&mut self, debug_ui: &mut DebugUI, event: &mut UIEvent, action: &mut UIAction) { - let bottom = debug_ui.framebuffer_size().height as i32 - PADDING; + let bottom = debug_ui.framebuffer_size().y() - PADDING; // Draw effects button. let effects_button_position = Point2DI32::new(PADDING, bottom - BUTTON_HEIGHT); @@ -153,7 +153,7 @@ impl DemoUI { return; } - let bottom = debug_ui.framebuffer_size().height as i32 - PADDING; + let bottom = debug_ui.framebuffer_size().y() - PADDING; let effects_panel_y = bottom - (BUTTON_HEIGHT + PADDING + EFFECTS_PANEL_HEIGHT); debug_ui.draw_solid_rect(RectI32::new(Point2DI32::new(PADDING, effects_panel_y), Point2DI32::new(EFFECTS_PANEL_WIDTH, @@ -192,7 +192,7 @@ impl DemoUI { return; } - let bottom = debug_ui.framebuffer_size().height as i32 - PADDING; + let bottom = debug_ui.framebuffer_size().y() - PADDING; let rotate_panel_y = bottom - (BUTTON_HEIGHT + PADDING + ROTATE_PANEL_HEIGHT); debug_ui.draw_solid_rect(RectI32::new(Point2DI32::new(ROTATE_PANEL_X, rotate_panel_y), Point2DI32::new(ROTATE_PANEL_WIDTH, diff --git a/geometry/Cargo.toml b/geometry/Cargo.toml index 48802d65..f339fa0b 100644 --- a/geometry/Cargo.toml +++ b/geometry/Cargo.toml @@ -7,7 +7,6 @@ authors = ["Patrick Walton "] [dependencies] arrayvec = "0.4" bitflags = "1.0" -euclid = "0.19" serde = "1.0" serde_derive = "1.0" smallvec = "0.6" diff --git a/geometry/src/basic/point.rs b/geometry/src/basic/point.rs index 9a742d62..f42746d9 100644 --- a/geometry/src/basic/point.rs +++ b/geometry/src/basic/point.rs @@ -10,7 +10,6 @@ //! A SIMD-optimized point type. -use euclid::Point2D; use pathfinder_simd::default::{F32x4, I32x4}; use std::ops::{Add, AddAssign, Mul, Neg, Sub}; @@ -29,16 +28,6 @@ impl Point2DF32 { Point2DF32(F32x4::splat(value)) } - #[inline] - pub fn from_euclid(point: Point2D) -> Point2DF32 { - Point2DF32::new(point.x, point.y) - } - - #[inline] - pub fn as_euclid(&self) -> Point2D { - Point2D::new(self.0[0], self.0[1]) - } - #[inline] pub fn to_3d(self) -> Point3DF32 { Point3DF32(self.0.concat_xy_xy(F32x4::new(0.0, 1.0, 0.0, 0.0))) @@ -110,11 +99,17 @@ impl Point2DF32 { Point2DF32(self.0.ceil()) } + /// Treats this point as a vector and calculates its squared length. + #[inline] + pub fn square_length(&self) -> f32 { + let squared = self.0 * self.0; + squared[0] + squared[1] + } + /// Treats this point as a vector and calculates its length. #[inline] pub fn length(&self) -> f32 { - let squared = self.0 * self.0; - f32::sqrt(squared[0] + squared[1]) + f32::sqrt(self.square_length()) } /// Treats this point as a vector and normalizes it. @@ -242,6 +237,14 @@ impl Sub for Point2DI32 { } } +impl PartialEq for Point2DI32 { + #[inline] + fn eq(&self, other: &Point2DI32) -> bool { + let results = self.0.packed_eq(other.0); + results[0] != 0 && results[1] != 0 + } +} + /// 3D homogeneous points. #[derive(Clone, Copy, Debug, PartialEq)] pub struct Point3DF32(pub F32x4); @@ -252,11 +255,6 @@ impl Point3DF32 { Point3DF32(F32x4::new(x, y, z, w)) } - #[inline] - pub fn from_euclid_2d(point: &Point2D) -> Point3DF32 { - Point3DF32::new(point.x, point.y, 0.0, 1.0) - } - #[inline] pub fn splat(value: f32) -> Point3DF32 { Point3DF32(F32x4::splat(value)) diff --git a/geometry/src/basic/transform3d.rs b/geometry/src/basic/transform3d.rs index a70ac149..d05170c7 100644 --- a/geometry/src/basic/transform3d.rs +++ b/geometry/src/basic/transform3d.rs @@ -10,11 +10,10 @@ //! 3D transforms that can be applied to paths. -use crate::basic::point::{Point2DF32, Point3DF32}; +use crate::basic::point::{Point2DF32, Point2DI32, Point3DF32}; use crate::basic::rect::RectF32; use crate::basic::transform2d::Matrix2x2F32; use crate::segment::Segment; -use euclid::Size2D; use pathfinder_simd::default::F32x4; use std::ops::{Add, Neg}; @@ -261,13 +260,13 @@ impl Neg for Matrix2x2F32 { #[derive(Clone, Copy, Debug)] pub struct Perspective { pub transform: Transform3DF32, - pub window_size: Size2D, + pub window_size: Point2DI32, } impl Perspective { #[inline] - pub fn new(transform: &Transform3DF32, window_size: &Size2D) -> Perspective { - Perspective { transform: *transform, window_size: *window_size } + pub fn new(transform: &Transform3DF32, window_size: Point2DI32) -> Perspective { + Perspective { transform: *transform, window_size } } #[inline] @@ -276,9 +275,7 @@ impl Perspective { .transform_point(point.to_3d()) .perspective_divide() .to_2d() * Point2DF32::new(1.0, -1.0); - let window_size = self.window_size.to_f32(); - let size_scale = Point2DF32::new(window_size.width * 0.5, window_size.height * 0.5); - (point + Point2DF32::splat(1.0)) * size_scale + (point + Point2DF32::splat(1.0)) * self.window_size.to_f32().scale(0.5) } // TODO(pcwalton): SIMD? diff --git a/geometry/src/segment.rs b/geometry/src/segment.rs index b1b6e63d..4426d66a 100644 --- a/geometry/src/segment.rs +++ b/geometry/src/segment.rs @@ -162,6 +162,16 @@ impl Segment { self.to_cubic().as_cubic_segment().split(t) } } + + #[inline] + pub fn sample(self, t: f32) -> Point2DF32 { + // FIXME(pcwalton): Don't degree elevate! + if self.is_line() { + self.as_line_segment().sample(t) + } else { + self.to_cubic().as_cubic_segment().sample(t) + } + } } #[derive(Clone, Copy, Debug, PartialEq)] diff --git a/geometry/src/stroke.rs b/geometry/src/stroke.rs index a028aa11..4c01b9c0 100644 --- a/geometry/src/stroke.rs +++ b/geometry/src/stroke.rs @@ -16,6 +16,8 @@ use crate::outline::{Contour, Outline}; use crate::segment::Segment as SegmentPF3; use std::mem; +const TOLERANCE: f32 = 0.01; + pub struct OutlineStrokeToFill { pub outline: Outline, pub radius: f32, @@ -74,15 +76,36 @@ impl ContourStrokeToFill { trait Offset { fn offset(&self, distance: f32, contour: &mut Contour); + fn offset_once(&self, distance: f32) -> Self; + fn error_is_within_tolerance(&self, other: &SegmentPF3, distance: f32) -> bool; } impl Offset for SegmentPF3 { fn offset(&self, distance: f32, contour: &mut Contour) { - if self.is_line() { - contour.push_full_segment(&SegmentPF3::line(&self.baseline.offset(distance)), true); + if self.baseline.square_length() < TOLERANCE * TOLERANCE { + contour.push_full_segment(self, true); return; } + let candidate = self.offset_once(distance); + if self.error_is_within_tolerance(&candidate, distance) { + contour.push_full_segment(&candidate, true); + return; + } + + //println!("--- SPLITTING ---"); + //println!("... PRE-SPLIT: {:?}", self); + let (before, after) = self.split(0.5); + //println!("... AFTER-SPLIT: {:?} {:?}", before, after); + before.offset(distance, contour); + after.offset(distance, contour); + } + + fn offset_once(&self, distance: f32) -> SegmentPF3 { + if self.is_line() { + return SegmentPF3::line(&self.baseline.offset(distance)); + } + if self.is_quadratic() { let mut segment_0 = LineSegmentF32::new(&self.baseline.from(), &self.ctrl.from()); let mut segment_1 = LineSegmentF32::new(&self.ctrl.from(), &self.baseline.to()); @@ -93,8 +116,7 @@ impl Offset for SegmentPF3 { None => segment_0.to().lerp(segment_1.from(), 0.5), }; let baseline = LineSegmentF32::new(&segment_0.from(), &segment_1.to()); - contour.push_full_segment(&SegmentPF3::quadratic(&baseline, &ctrl), true); - return; + return SegmentPF3::quadratic(&baseline, &ctrl); } debug_assert!(self.is_cubic()); @@ -110,8 +132,7 @@ impl Offset for SegmentPF3 { }; let baseline = LineSegmentF32::new(&segment_0.from(), &segment_1.to()); let ctrl = LineSegmentF32::new(&segment_0.from(), &ctrl); - contour.push_full_segment(&SegmentPF3::cubic(&baseline, &ctrl), true); - return; + return SegmentPF3::cubic(&baseline, &ctrl); } if self.ctrl.to() == self.baseline.to() { @@ -125,8 +146,7 @@ impl Offset for SegmentPF3 { }; let baseline = LineSegmentF32::new(&segment_0.from(), &segment_1.to()); let ctrl = LineSegmentF32::new(&ctrl, &segment_1.to()); - contour.push_full_segment(&SegmentPF3::cubic(&baseline, &ctrl), true); - return; + return SegmentPF3::cubic(&baseline, &ctrl); } let mut segment_0 = LineSegmentF32::new(&self.baseline.from(), &self.ctrl.from()); @@ -145,6 +165,29 @@ impl Offset for SegmentPF3 { }; let baseline = LineSegmentF32::new(&segment_0.from(), &segment_2.to()); let ctrl = LineSegmentF32::new(&ctrl_0, &ctrl_1); - contour.push_full_segment(&SegmentPF3::cubic(&baseline, &ctrl), true); + SegmentPF3::cubic(&baseline, &ctrl) + } + + fn error_is_within_tolerance(&self, other: &SegmentPF3, distance: f32) -> bool { + let (mut min, mut max) = (f32::abs(distance) - TOLERANCE, f32::abs(distance) + TOLERANCE); + min = if min <= 0.0 { 0.0 } else { min * min }; + max = if max <= 0.0 { 0.0 } else { max * max }; + + for t_num in 0..(SAMPLE_COUNT + 1) { + let t = t_num as f32 / SAMPLE_COUNT as f32; + // FIXME(pcwalton): Use signed distance! + let (this_p, other_p) = (self.sample(t), other.sample(t)); + let vector = this_p - other_p; + let square_distance = vector.square_length(); + /*println!("this_p={:?} other_p={:?} vector={:?} sqdist={:?} min={:?} max={:?}", + this_p, other_p, vector, square_distance, min, max);*/ + if square_distance < min || square_distance > max { + return false; + } + } + + return true; + + const SAMPLE_COUNT: u32 = 16; } } diff --git a/gl/Cargo.toml b/gl/Cargo.toml index 5cccd0cf..51b026c3 100644 --- a/gl/Cargo.toml +++ b/gl/Cargo.toml @@ -5,7 +5,6 @@ edition = "2018" authors = ["Patrick Walton "] [dependencies] -euclid = "0.19" gl = "0.6" serde = "1.0" serde_derive = "1.0" diff --git a/gl/src/debug.rs b/gl/src/debug.rs index eabebed5..60e8b255 100644 --- a/gl/src/debug.rs +++ b/gl/src/debug.rs @@ -17,7 +17,6 @@ use crate::device::{Buffer, BufferTarget, BufferUploadMode, Device, Program, Texture}; use crate::device::{Uniform, VertexAttr}; -use euclid::Size2D; use gl::types::{GLfloat, GLint, GLsizei, GLuint}; use gl; use pathfinder_geometry::basic::point::Point2DI32; @@ -91,7 +90,7 @@ impl DebugFont { } pub struct DebugUI { - framebuffer_size: Size2D, + framebuffer_size: Point2DI32, texture_program: DebugTextureProgram, texture_vertex_array: DebugTextureVertexArray, @@ -105,7 +104,7 @@ pub struct DebugUI { } impl DebugUI { - pub fn new(device: &Device, framebuffer_size: &Size2D) -> DebugUI { + pub fn new(device: &Device, framebuffer_size: Point2DI32) -> DebugUI { let texture_program = DebugTextureProgram::new(device); let texture_vertex_array = DebugTextureVertexArray::new(&texture_program); let font = DebugFont::load(device); @@ -119,7 +118,7 @@ impl DebugUI { let font_texture = device.create_texture_from_png(FONT_PNG_NAME); DebugUI { - framebuffer_size: *framebuffer_size, + framebuffer_size, texture_program, texture_vertex_array, font, @@ -131,12 +130,12 @@ impl DebugUI { } } - pub fn framebuffer_size(&self) -> Size2D { + pub fn framebuffer_size(&self) -> Point2DI32 { self.framebuffer_size } - pub fn set_framebuffer_size(&mut self, window_size: &Size2D) { - self.framebuffer_size = *window_size; + pub fn set_framebuffer_size(&mut self, window_size: Point2DI32) { + self.framebuffer_size = window_size; } pub fn add_sample(&mut self, tile_time: Duration, rendering_time: Option) { @@ -148,9 +147,9 @@ impl DebugUI { pub fn draw(&self) { // Draw performance window. - let bottom = self.framebuffer_size.height as i32 - PADDING; + let bottom = self.framebuffer_size.y() - PADDING; let window_rect = RectI32::new( - Point2DI32::new(self.framebuffer_size.width as i32 - PADDING - PERF_WINDOW_WIDTH, + Point2DI32::new(self.framebuffer_size.x() - PADDING - PERF_WINDOW_WIDTH, bottom - PERF_WINDOW_HEIGHT), Point2DI32::new(PERF_WINDOW_WIDTH, PERF_WINDOW_HEIGHT)); self.draw_solid_rect(window_rect, WINDOW_COLOR); @@ -188,8 +187,8 @@ impl DebugUI { gl::BindVertexArray(self.solid_vertex_array.gl_vertex_array); gl::UseProgram(self.solid_program.program.gl_program); gl::Uniform2f(self.solid_program.framebuffer_size_uniform.location, - self.framebuffer_size.width as GLfloat, - self.framebuffer_size.height as GLfloat); + self.framebuffer_size.x() as GLfloat, + self.framebuffer_size.y() as GLfloat); set_color_uniform(&self.solid_program.color_uniform, color); gl::BlendEquation(gl::FUNC_ADD); gl::BlendFunc(gl::ONE, gl::ONE_MINUS_SRC_ALPHA); @@ -237,9 +236,8 @@ impl DebugUI { } pub fn draw_texture(&self, origin: Point2DI32, texture: &Texture, color: ColorU) { - let size = Point2DI32::new(texture.size.width as i32, texture.size.height as i32); - let position_rect = RectI32::new(origin, size); - let tex_coord_rect = RectI32::new(Point2DI32::default(), size); + let position_rect = RectI32::new(origin, texture.size); + let tex_coord_rect = RectI32::new(Point2DI32::default(), texture.size); let vertex_data = [ DebugTextureVertex::new(position_rect.origin(), tex_coord_rect.origin()), DebugTextureVertex::new(position_rect.upper_right(), tex_coord_rect.upper_right()), @@ -279,11 +277,11 @@ impl DebugUI { gl::BindVertexArray(self.texture_vertex_array.gl_vertex_array); gl::UseProgram(self.texture_program.program.gl_program); gl::Uniform2f(self.texture_program.framebuffer_size_uniform.location, - self.framebuffer_size.width as GLfloat, - self.framebuffer_size.height as GLfloat); + self.framebuffer_size.x() as GLfloat, + self.framebuffer_size.y() as GLfloat); gl::Uniform2f(self.texture_program.texture_size_uniform.location, - texture.size.width as GLfloat, - texture.size.height as GLfloat); + texture.size.x() as GLfloat, + texture.size.y() as GLfloat); set_color_uniform(&self.texture_program.color_uniform, color); texture.bind(0); gl::Uniform1i(self.texture_program.texture_uniform.location, 0); diff --git a/gl/src/device.rs b/gl/src/device.rs index db50b8e5..aea68e98 100644 --- a/gl/src/device.rs +++ b/gl/src/device.rs @@ -10,8 +10,8 @@ //! Minimal abstractions over GPU device capabilities. -use euclid::Size2D; use gl::types::{GLchar, GLint, GLsizei, GLsizeiptr, GLuint, GLvoid}; +use pathfinder_geometry::basic::point::Point2DI32; use std::env; use std::ffi::CString; use std::fs::File; @@ -40,7 +40,7 @@ impl Device { let mut texture = Texture { gl_texture: 0, - size: Size2D::new(image.width(), image.height()), + size: Point2DI32::new(image.width() as i32, image.height() as i32), }; unsafe { @@ -338,20 +338,20 @@ enum ShaderKind { pub struct Texture { gl_texture: GLuint, - pub size: Size2D, + pub size: Point2DI32, } impl Texture { - pub fn new_r16f(size: &Size2D) -> Texture { - let mut texture = Texture { gl_texture: 0, size: *size }; + pub fn new_r16f(size: Point2DI32) -> Texture { + let mut texture = Texture { gl_texture: 0, size }; unsafe { gl::GenTextures(1, &mut texture.gl_texture); texture.bind(0); gl::TexImage2D(gl::TEXTURE_2D, 0, gl::R16F as GLint, - size.width as GLsizei, - size.height as GLsizei, + size.x() as GLsizei, + size.y() as GLsizei, 0, gl::RED, gl::HALF_FLOAT, @@ -362,16 +362,16 @@ impl Texture { texture } - pub fn new_rgba(size: &Size2D) -> Texture { - let mut texture = Texture { gl_texture: 0, size: *size }; + pub fn new_rgba(size: Point2DI32) -> Texture { + let mut texture = Texture { gl_texture: 0, size }; unsafe { gl::GenTextures(1, &mut texture.gl_texture); texture.bind(0); gl::TexImage2D(gl::TEXTURE_2D, 0, gl::RGBA as GLint, - size.width as GLsizei, - size.height as GLsizei, + size.x() as GLsizei, + size.y() as GLsizei, 0, gl::RGBA, gl::UNSIGNED_BYTE, @@ -389,15 +389,15 @@ impl Texture { } } - pub fn upload_rgba(&self, size: &Size2D, data: &[u8]) { - assert!(data.len() >= size.width as usize * size.height as usize * 4); + pub fn upload_rgba(&self, size: Point2DI32, data: &[u8]) { + assert!(data.len() >= size.x() as usize * size.y() as usize * 4); unsafe { self.bind(0); gl::TexImage2D(gl::TEXTURE_2D, 0, gl::RGBA as GLint, - size.width as GLsizei, - size.height as GLsizei, + size.x() as GLsizei, + size.y() as GLsizei, 0, gl::RGBA, gl::UNSIGNED_BYTE, diff --git a/gl/src/renderer.rs b/gl/src/renderer.rs index 97a40f4c..499abbc4 100644 --- a/gl/src/renderer.rs +++ b/gl/src/renderer.rs @@ -11,9 +11,8 @@ use crate::debug::DebugUI; use crate::device::{Buffer, BufferTarget, BufferUploadMode, Device, Framebuffer, Program, Texture}; use crate::device::{TimerQuery, Uniform, VertexArray, VertexAttr}; -use euclid::Size2D; use gl::types::{GLfloat, GLint}; -use pathfinder_geometry::basic::point::Point3DF32; +use pathfinder_geometry::basic::point::{Point2DI32, Point3DF32}; use pathfinder_renderer::gpu_data::{Batch, BuiltScene, SolidTileScenePrimitive}; use pathfinder_renderer::paint::{ColorU, ObjectShader}; use pathfinder_renderer::post::DefringingKernel; @@ -23,16 +22,16 @@ use std::time::Duration; static QUAD_VERTEX_POSITIONS: [u8; 8] = [0, 0, 1, 0, 1, 1, 0, 1]; -const MASK_FRAMEBUFFER_WIDTH: u32 = TILE_WIDTH * 256; -const MASK_FRAMEBUFFER_HEIGHT: u32 = TILE_HEIGHT * 256; +const MASK_FRAMEBUFFER_WIDTH: i32 = TILE_WIDTH as i32 * 256; +const MASK_FRAMEBUFFER_HEIGHT: i32 = TILE_HEIGHT as i32 * 256; // TODO(pcwalton): Replace with `mem::size_of` calls? const FILL_INSTANCE_SIZE: GLint = 8; const SOLID_TILE_INSTANCE_SIZE: GLint = 6; const MASK_TILE_INSTANCE_SIZE: GLint = 8; -const FILL_COLORS_TEXTURE_WIDTH: u32 = 256; -const FILL_COLORS_TEXTURE_HEIGHT: u32 = 256; +const FILL_COLORS_TEXTURE_WIDTH: i32 = 256; +const FILL_COLORS_TEXTURE_HEIGHT: i32 = 256; pub struct Renderer { // Core shaders @@ -63,13 +62,13 @@ pub struct Renderer { pub debug_ui: DebugUI, // Extra info - main_framebuffer_size: Size2D, + main_framebuffer_size: Point2DI32, postprocess_options: PostprocessOptions, use_depth: bool, } impl Renderer { - pub fn new(device: &Device, main_framebuffer_size: &Size2D) -> Renderer { + pub fn new(device: &Device, main_framebuffer_size: Point2DI32) -> Renderer { let fill_program = FillProgram::new(device); let solid_tile_program = SolidTileProgram::new(device); let mask_tile_program = MaskTileProgram::new(device); @@ -95,12 +94,12 @@ impl Renderer { &quad_vertex_positions_buffer); let stencil_vertex_array = StencilVertexArray::new(&stencil_program); - let mask_framebuffer_texture = Texture::new_r16f(&Size2D::new(MASK_FRAMEBUFFER_WIDTH, - MASK_FRAMEBUFFER_HEIGHT)); + let mask_framebuffer_texture = Texture::new_r16f(Point2DI32::new(MASK_FRAMEBUFFER_WIDTH, + MASK_FRAMEBUFFER_HEIGHT)); let mask_framebuffer = Framebuffer::new(mask_framebuffer_texture); - let fill_colors_texture = Texture::new_rgba(&Size2D::new(FILL_COLORS_TEXTURE_WIDTH, - FILL_COLORS_TEXTURE_HEIGHT)); + let fill_colors_texture = Texture::new_rgba(Point2DI32::new(FILL_COLORS_TEXTURE_WIDTH, + FILL_COLORS_TEXTURE_HEIGHT)); let debug_ui = DebugUI::new(device, main_framebuffer_size); @@ -129,7 +128,7 @@ impl Renderer { debug_ui, - main_framebuffer_size: *main_framebuffer_size, + main_framebuffer_size, postprocess_options: PostprocessOptions::default(), use_depth: false, } @@ -176,8 +175,8 @@ impl Renderer { } #[inline] - pub fn set_main_framebuffer_size(&mut self, new_framebuffer_size: &Size2D) { - self.main_framebuffer_size = *new_framebuffer_size; + pub fn set_main_framebuffer_size(&mut self, new_framebuffer_size: Point2DI32) { + self.main_framebuffer_size = new_framebuffer_size; self.debug_ui.set_framebuffer_size(new_framebuffer_size); } @@ -217,15 +216,15 @@ impl Renderer { } fn upload_shaders(&mut self, shaders: &[ObjectShader]) { - let size = Size2D::new(FILL_COLORS_TEXTURE_WIDTH, FILL_COLORS_TEXTURE_HEIGHT); - let mut fill_colors = vec![0; size.width as usize * size.height as usize * 4]; + let size = Point2DI32::new(FILL_COLORS_TEXTURE_WIDTH, FILL_COLORS_TEXTURE_HEIGHT); + let mut fill_colors = vec![0; size.x() as usize * size.y() as usize * 4]; for (shader_index, shader) in shaders.iter().enumerate() { fill_colors[shader_index * 4 + 0] = shader.fill_color.r; fill_colors[shader_index * 4 + 1] = shader.fill_color.g; fill_colors[shader_index * 4 + 2] = shader.fill_color.b; fill_colors[shader_index * 4 + 3] = shader.fill_color.a; } - self.fill_colors_texture.upload_rgba(&size, &fill_colors); + self.fill_colors_texture.upload_rgba(size, &fill_colors); } fn upload_solid_tiles(&mut self, solid_tiles: &[SolidTileScenePrimitive]) { @@ -279,8 +278,8 @@ impl Renderer { gl::BindVertexArray(self.mask_tile_vertex_array.vertex_array.gl_vertex_array); gl::UseProgram(self.mask_tile_program.program.gl_program); gl::Uniform2f(self.mask_tile_program.framebuffer_size_uniform.location, - self.main_framebuffer_size.width as GLfloat, - self.main_framebuffer_size.height as GLfloat); + self.main_framebuffer_size.x() as GLfloat, + self.main_framebuffer_size.y() as GLfloat); gl::Uniform2f(self.mask_tile_program.tile_size_uniform.location, TILE_WIDTH as GLfloat, TILE_HEIGHT as GLfloat); @@ -313,8 +312,8 @@ impl Renderer { gl::BindVertexArray(self.solid_tile_vertex_array.vertex_array.gl_vertex_array); gl::UseProgram(self.solid_tile_program.program.gl_program); gl::Uniform2f(self.solid_tile_program.framebuffer_size_uniform.location, - self.main_framebuffer_size.width as GLfloat, - self.main_framebuffer_size.height as GLfloat); + self.main_framebuffer_size.x() as GLfloat, + self.main_framebuffer_size.y() as GLfloat); gl::Uniform2f(self.solid_tile_program.tile_size_uniform.location, TILE_WIDTH as GLfloat, TILE_HEIGHT as GLfloat); @@ -342,8 +341,8 @@ impl Renderer { gl::BindVertexArray(self.postprocess_vertex_array.vertex_array.gl_vertex_array); gl::UseProgram(self.postprocess_program.program.gl_program); gl::Uniform2f(self.postprocess_program.framebuffer_size_uniform.location, - self.main_framebuffer_size.width as GLfloat, - self.main_framebuffer_size.height as GLfloat); + self.main_framebuffer_size.x() as GLfloat, + self.main_framebuffer_size.y() as GLfloat); match self.postprocess_options.defringing_kernel { Some(ref kernel) => { debug_assert!(kernel.0.len() == 4); @@ -421,8 +420,8 @@ impl Renderer { unsafe { gl::Viewport(0, 0, - self.main_framebuffer_size.width as GLint, - self.main_framebuffer_size.height as GLint); + self.main_framebuffer_size.x(), + self.main_framebuffer_size.y()); } } @@ -437,7 +436,7 @@ impl Renderer { existing_framebuffer.texture.size == self.main_framebuffer_size => {} _ => { self.postprocess_source_framebuffer = - Some(Framebuffer::new(Texture::new_rgba(&self.main_framebuffer_size))); + Some(Framebuffer::new(Texture::new_rgba(self.main_framebuffer_size))); } }; diff --git a/renderer/Cargo.toml b/renderer/Cargo.toml index 1df1e004..9786fcbf 100644 --- a/renderer/Cargo.toml +++ b/renderer/Cargo.toml @@ -6,7 +6,6 @@ authors = ["Patrick Walton "] [dependencies] byteorder = "1.2" -euclid = "0.19" fixedbitset = "0.1" hashbrown = "0.1" rayon = "1.0" diff --git a/svg/Cargo.toml b/svg/Cargo.toml index fb6a782c..faa862f9 100644 --- a/svg/Cargo.toml +++ b/svg/Cargo.toml @@ -5,7 +5,6 @@ edition = "2018" authors = ["Patrick Walton "] [dependencies] -lyon_path = "0.12" usvg = "0.4" [dependencies.pathfinder_geometry] diff --git a/utils/tile-svg/Cargo.toml b/utils/tile-svg/Cargo.toml index 159085f3..94985cb5 100644 --- a/utils/tile-svg/Cargo.toml +++ b/utils/tile-svg/Cargo.toml @@ -11,7 +11,6 @@ pf-no-simd = [] arrayvec = "0.4" byteorder = "1.2" clap = "2.32" -euclid = "0.19" fixedbitset = "0.1" hashbrown = "0.1" jemallocator = "0.1"