diff --git a/Cargo.lock b/Cargo.lock index e5254778..be32afb1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -369,10 +369,10 @@ dependencies = [ "lyon", "rayon", "resvg", - "roxmltree", + "roxmltree 0.14.1", "rust-fontconfig", - "tiny-skia", - "usvg", + "tiny-skia 0.6.6", + "usvg 0.22.0", "xmlparser", "xmlwriter", ] @@ -398,6 +398,12 @@ version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" +[[package]] +name = "base64" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" + [[package]] name = "binary-space-partition" version = "0.1.2" @@ -645,6 +651,12 @@ dependencies = [ "matches", ] +[[package]] +name = "data-url" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d7439c3735f405729d52c3fbbe4de140eaf938a1fe47d227c27f8254d4302a5" + [[package]] name = "derive_more" version = "0.99.17" @@ -808,16 +820,6 @@ dependencies = [ "syn 2.0.15", ] -[[package]] -name = "gif" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3edd93c6756b4dfaf2709eafcc345ba2636565295c198a9cfbf75fa5e3e00b06" -dependencies = [ - "color_quant", - "weezl", -] - [[package]] name = "gif" version = "0.12.0" @@ -876,14 +878,20 @@ dependencies = [ "bytemuck", "byteorder", "color_quant", - "gif 0.12.0", - "jpeg-decoder 0.3.0", + "gif", + "jpeg-decoder", "num-rational", "num-traits", "png", "tiff", ] +[[package]] +name = "imagesize" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b72ad49b554c1728b1e83254a1b1565aea4161e28dabbfa171fc15fe62299caf" + [[package]] name = "indoc" version = "1.0.9" @@ -924,12 +932,6 @@ version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" -[[package]] -name = "jpeg-decoder" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9478aa10f73e7528198d75109c8be5cd7d15fb530238040148d5f9a22d4c5b3b" - [[package]] name = "jpeg-decoder" version = "0.3.0" @@ -948,6 +950,15 @@ dependencies = [ "arrayvec 0.7.2", ] +[[package]] +name = "kurbo" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d676038719d1c892f91e6e85121550143c75880b42f7feff6d413a078cf91fb3" +dependencies = [ + "arrayvec 0.7.2", +] + [[package]] name = "lazy_static" version = "1.4.0" @@ -1273,6 +1284,12 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "db8bcd96cb740d03149cbad5518db9fd87126a10ab519c011893b1754134c468" +[[package]] +name = "pico-args" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" + [[package]] name = "pkg-config" version = "0.3.26" @@ -1451,6 +1468,12 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ae028b272a6e99d9f8260ceefa3caa09300a8d6c8d2b2001316474bc52122e9" +[[package]] +name = "rctree" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b42e27ef78c35d3998403c1d26f3efd9e135d3e5121b0a4845cc5cc27547f4f" + [[package]] name = "redox_syscall" version = "0.2.16" @@ -1462,19 +1485,16 @@ dependencies = [ [[package]] name = "resvg" -version = "0.22.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e702d1e8e00a3a0717b96244cba840f34f542d8f23097c8903266c4e2975658" +checksum = "142e83d8ae8c8c639f304698a5567b229ba65caba867bf4387bbc0ae158827cf" dependencies = [ - "gif 0.11.4", - "jpeg-decoder 0.2.6", "log", - "pico-args", - "png", + "pico-args 0.5.0", "rgb", - "svgtypes", - "tiny-skia", - "usvg", + "svgtypes 0.11.0", + "tiny-skia 0.9.0", + "usvg 0.32.0", ] [[package]] @@ -1486,6 +1506,19 @@ dependencies = [ "bytemuck", ] +[[package]] +name = "rosvgtree" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad747e7384940e7bf33b15ba433b7bad9f44c0c6d5287a67c2cb22cd1743d497" +dependencies = [ + "log", + "roxmltree 0.18.0", + "simplecss", + "siphasher", + "svgtypes 0.11.0", +] + [[package]] name = "roxmltree" version = "0.14.1" @@ -1495,6 +1528,15 @@ dependencies = [ "xmlparser", ] +[[package]] +name = "roxmltree" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8f595a457b6b8c6cda66a48503e92ee8d19342f905948f29c383200ec9eb1d8" +dependencies = [ + "xmlparser", +] + [[package]] name = "rust-fontconfig" version = "0.1.6" @@ -1534,15 +1576,6 @@ version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" -[[package]] -name = "safe_arch" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ff3d6d9696af502cc3110dacce942840fb06ff4514cad92236ecc455f2ce05" -dependencies = [ - "bytemuck", -] - [[package]] name = "scopeguard" version = "1.1.0" @@ -1643,6 +1676,15 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b278b244ef7aa5852b277f52dd0c6cac3a109919e1f6d699adde63251227a30f" +[[package]] +name = "strict-num" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9df65f20698aeed245efdde3628a6b559ea1239bbb871af1b6e3b58c413b2bd1" +dependencies = [ + "float-cmp", +] + [[package]] name = "svg_fmt" version = "0.4.1" @@ -1658,6 +1700,16 @@ dependencies = [ "siphasher", ] +[[package]] +name = "svgtypes" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed4b0611e7f3277f68c0fa18e385d9e2d26923691379690039548f867cef02a7" +dependencies = [ + "kurbo 0.9.4", + "siphasher", +] + [[package]] name = "syn" version = "1.0.109" @@ -1705,7 +1757,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7449334f9ff2baf290d55d73983a7d6fa15e01198faef72af07e2a8db851e471" dependencies = [ "flate2", - "jpeg-decoder 0.3.0", + "jpeg-decoder", "weezl", ] @@ -1731,8 +1783,32 @@ dependencies = [ "bytemuck", "cfg-if", "libm", +] + +[[package]] +name = "tiny-skia" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b610cd8b9a29feb9029c30f1e7bff634651b6e4e925388ee6cff4c68d901a3e" +dependencies = [ + "arrayref", + "arrayvec 0.7.2", + "bytemuck", + "cfg-if", + "log", "png", - "safe_arch", + "tiny-skia-path", +] + +[[package]] +name = "tiny-skia-path" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7acb0ccda1ac91084353a56d0b69b0e29c311fd809d2088b1ed2f9ae1841c47" +dependencies = [ + "arrayref", + "bytemuck", + "strict-num", ] [[package]] @@ -1847,21 +1923,64 @@ version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a261d60a7215fa339482047cc3dafd4e22e2bf34396aaebef2b707355bbb39c0" dependencies = [ - "base64", - "data-url", + "base64 0.13.1", + "data-url 0.1.1", "flate2", "float-cmp", - "kurbo", + "kurbo 0.8.3", "log", - "pico-args", - "rctree", - "roxmltree", + "pico-args 0.4.2", + "rctree 0.4.0", + "roxmltree 0.14.1", "simplecss", "siphasher", - "svgtypes", + "svgtypes 0.8.2", "xmlwriter", ] +[[package]] +name = "usvg" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b44e14b7678bcc5947b397991432d0c4e02a103958a0ed5e1b9b961ddd08b21" +dependencies = [ + "base64 0.21.0", + "log", + "pico-args 0.5.0", + "usvg-parser", + "usvg-tree", + "xmlwriter", +] + +[[package]] +name = "usvg-parser" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90c8251d965c2882a636ffcc054340b1f13a6bce68779cb5b2084d8ffc2535be" +dependencies = [ + "data-url 0.2.0", + "flate2", + "imagesize", + "kurbo 0.9.4", + "log", + "rosvgtree", + "strict-num", + "svgtypes 0.11.0", + "usvg-tree", +] + +[[package]] +name = "usvg-tree" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7371265c467cdae0ccc3655e2e3f310c695fb9f717c0d25187bf3b333f7b5159" +dependencies = [ + "kurbo 0.9.4", + "rctree 0.5.0", + "strict-num", + "svgtypes 0.11.0", +] + [[package]] name = "version_check" version = "0.9.4" diff --git a/azulc/Cargo.toml b/azulc/Cargo.toml index f0007a8e..39117104 100644 --- a/azulc/Cargo.toml +++ b/azulc/Cargo.toml @@ -37,7 +37,7 @@ rust-fontconfig = { version = "0.1.5", default-features = fals lyon = { version = "0.17.10", default-features = false, optional = true } rayon = { version = "1.5.3", default-features = false, optional = true } usvg = { version = "0.22.0", default-features = false, optional = true, features = ["export"] } -resvg = { version = "0.22.0", default-features = false, optional = true } +resvg = { version = "0.32.0", default-features = false, optional = true } roxmltree = { version = "0.14.0", default-features = false, optional = true } tiny-skia = { version = "0.6.5", default-features = false, optional = true, features = ["libm"] } xmlwriter = { version = "0.1.0", default-features = false }