diff options
author | Marge Bot <marge-bot@gnome.org> | 2023-05-09 16:17:32 +0000 |
---|---|---|
committer | Marge Bot <marge-bot@gnome.org> | 2023-05-09 16:17:32 +0000 |
commit | 46fd6e5f44a58f8756b8ba0e9e2be2bac772529a (patch) | |
tree | be6ef56dfd78780f29dce49064e7d7dd6c47f681 | |
parent | 3ac8b7ca56524aac1d53b383935c8dfe03b12967 (diff) | |
parent | c69d8919faf558deb00272efe6b123461e5a82c0 (diff) | |
download | librsvg-46fd6e5f44a58f8756b8ba0e9e2be2bac772529a.tar.gz |
Merge branch 'fix-rsvg-convert-paths' into 'main'
(#956): Rename rsvg-convert directory to rsvg_convert to avoid clashing with...
Closes #956
See merge request GNOME/librsvg!829
-rw-r--r-- | Cargo.lock | 100 | ||||
-rw-r--r-- | Cargo.toml | 4 | ||||
-rw-r--r-- | Makefile.am | 28 | ||||
-rw-r--r-- | rsvg_convert/Cargo.toml (renamed from rsvg-convert/Cargo.toml) | 9 | ||||
-rw-r--r-- | rsvg_convert/build.rs (renamed from rsvg-convert/build.rs) | 0 | ||||
-rw-r--r-- | rsvg_convert/src/main.rs (renamed from rsvg-convert/src/main.rs) | 0 | ||||
-rw-r--r-- | rsvg_convert/tests/fixtures/a-link.svg (renamed from rsvg-convert/tests/fixtures/a-link.svg) | 0 | ||||
-rw-r--r-- | rsvg_convert/tests/fixtures/accept-language-de.png (renamed from rsvg-convert/tests/fixtures/accept-language-de.png) | bin | 173 -> 173 bytes | |||
-rw-r--r-- | rsvg_convert/tests/fixtures/accept-language-es.png (renamed from rsvg-convert/tests/fixtures/accept-language-es.png) | bin | 172 -> 172 bytes | |||
-rw-r--r-- | rsvg_convert/tests/fixtures/accept-language-fallback.png (renamed from rsvg-convert/tests/fixtures/accept-language-fallback.png) | bin | 173 -> 173 bytes | |||
-rw-r--r-- | rsvg_convert/tests/fixtures/accept-language.svg (renamed from rsvg-convert/tests/fixtures/accept-language.svg) | 0 | ||||
-rw-r--r-- | rsvg_convert/tests/fixtures/bug521-with-viewbox.svg (renamed from rsvg-convert/tests/fixtures/bug521-with-viewbox.svg) | 0 | ||||
-rw-r--r-- | rsvg_convert/tests/fixtures/bug591-vbox-overflow.svg (renamed from rsvg-convert/tests/fixtures/bug591-vbox-overflow.svg) | 0 | ||||
-rw-r--r-- | rsvg_convert/tests/fixtures/bug601-zero-stroke-width-render-only-foo.png (renamed from rsvg-convert/tests/fixtures/bug601-zero-stroke-width-render-only-foo.png) | bin | 95 -> 95 bytes | |||
-rw-r--r-- | rsvg_convert/tests/fixtures/bug601-zero-stroke-width.svg (renamed from rsvg-convert/tests/fixtures/bug601-zero-stroke-width.svg) | 0 | ||||
-rw-r--r-- | rsvg_convert/tests/fixtures/bug677-partial-pixel.svg (renamed from rsvg-convert/tests/fixtures/bug677-partial-pixel.svg) | 0 | ||||
-rw-r--r-- | rsvg_convert/tests/fixtures/dimensions-in.svg (renamed from rsvg-convert/tests/fixtures/dimensions-in.svg) | 0 | ||||
-rw-r--r-- | rsvg_convert/tests/fixtures/dpi.svg (renamed from rsvg-convert/tests/fixtures/dpi.svg) | 0 | ||||
-rw-r--r-- | rsvg_convert/tests/fixtures/empty.svg (renamed from rsvg-convert/tests/fixtures/empty.svg) | 0 | ||||
-rw-r--r-- | rsvg_convert/tests/fixtures/example.svg (renamed from rsvg-convert/tests/fixtures/example.svg) | 0 | ||||
-rw-r--r-- | rsvg_convert/tests/fixtures/geometry-element.svg (renamed from rsvg-convert/tests/fixtures/geometry-element.svg) | 0 | ||||
-rw-r--r-- | rsvg_convert/tests/fixtures/gimp-wilber-ref.png (renamed from rsvg-convert/tests/fixtures/gimp-wilber-ref.png) | bin | 2503 -> 2503 bytes | |||
-rw-r--r-- | rsvg_convert/tests/fixtures/gimp-wilber.svg (renamed from rsvg-convert/tests/fixtures/gimp-wilber.svg) | 0 | ||||
-rw-r--r-- | rsvg_convert/tests/fixtures/hello-world.svg (renamed from rsvg-convert/tests/fixtures/hello-world.svg) | 0 | ||||
-rw-r--r-- | rsvg_convert/tests/fixtures/offset-png.png (renamed from rsvg-convert/tests/fixtures/offset-png.png) | bin | 1426 -> 1426 bytes | |||
-rw-r--r-- | rsvg_convert/tests/fixtures/sub-rect-no-unit.svg (renamed from rsvg-convert/tests/fixtures/sub-rect-no-unit.svg) | 0 | ||||
-rw-r--r-- | rsvg_convert/tests/fixtures/text-a-link.svg (renamed from rsvg-convert/tests/fixtures/text-a-link.svg) | 0 | ||||
-rw-r--r-- | rsvg_convert/tests/fixtures/zero-offset-png.png (renamed from rsvg-convert/tests/fixtures/zero-offset-png.png) | bin | 1419 -> 1419 bytes | |||
-rw-r--r-- | rsvg_convert/tests/internal_predicates/file.rs (renamed from rsvg-convert/tests/internal_predicates/file.rs) | 0 | ||||
-rw-r--r-- | rsvg_convert/tests/internal_predicates/mod.rs (renamed from rsvg-convert/tests/internal_predicates/mod.rs) | 0 | ||||
-rw-r--r-- | rsvg_convert/tests/internal_predicates/pdf.rs (renamed from rsvg-convert/tests/internal_predicates/pdf.rs) | 0 | ||||
-rw-r--r-- | rsvg_convert/tests/internal_predicates/png.rs (renamed from rsvg-convert/tests/internal_predicates/png.rs) | 0 | ||||
-rw-r--r-- | rsvg_convert/tests/internal_predicates/svg.rs (renamed from rsvg-convert/tests/internal_predicates/svg.rs) | 0 | ||||
-rw-r--r-- | rsvg_convert/tests/rsvg_convert.rs (renamed from rsvg-convert/tests/rsvg_convert.rs) | 0 |
34 files changed, 70 insertions, 71 deletions
@@ -34,9 +34,9 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" [[package]] name = "anstream" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6342bd4f5a1205d7f41e94a41a901f5647c938cdfa96036338e8533c9d6c2450" +checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" dependencies = [ "anstyle", "anstyle-parse", @@ -83,9 +83,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.70" +version = "1.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4" +checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" [[package]] name = "approx" @@ -279,9 +279,9 @@ dependencies = [ [[package]] name = "clap" -version = "3.2.24" +version = "3.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eef2b3ded6a26dfaec672a742c93c8cf6b689220324da509ec5caa20de55dc83" +checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" dependencies = [ "bitflags", "clap_lex 0.2.4", @@ -291,9 +291,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.2.4" +version = "4.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "956ac1f6381d8d82ab4684768f89c0ea3afe66925ceadb4eeb3fc452ffc55d62" +checksum = "34d21f9bf1b425d2968943631ec91202fe5e837264063503708b83013f8fc938" dependencies = [ "clap_builder", "clap_derive", @@ -302,9 +302,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.2.4" +version = "4.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84080e799e54cff944f4b4a4b0e71630b0e0443b25b985175c7dddc1a859b749" +checksum = "914c8c79fb560f238ef6429439a30023c862f7a28e688c58f7203f12b29970bd" dependencies = [ "anstream", "anstyle", @@ -320,7 +320,7 @@ version = "4.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a19591b2ab0e3c04b588a0e04ddde7b9eaa423646d1b4a8092879216bf47473" dependencies = [ - "clap 4.2.4", + "clap 4.2.7", ] [[package]] @@ -403,7 +403,7 @@ dependencies = [ "atty", "cast", "ciborium", - "clap 3.2.24", + "clap 3.2.25", "criterion-plot", "itertools", "lazy_static", @@ -664,12 +664,12 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.25" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" +checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" dependencies = [ "crc32fast", - "miniz_oxide 0.6.2", + "miniz_oxide", ] [[package]] @@ -1075,9 +1075,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.142" +version = "0.2.144" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317" +checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" [[package]] name = "libloading" @@ -1178,9 +1178,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.3.4" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36eb31c1778188ae1e64398743890d0877fef36d11521ac60406b42016e8c2cf" +checksum = "ece97ea872ece730aed82664c424eb4c8291e1ff2480247ccf7409044bc6479f" [[package]] name = "locale_config" @@ -1269,10 +1269,11 @@ checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[package]] name = "matrixmultiply" -version = "0.3.3" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb99c395ae250e1bf9133673f03ca9f97b7e71b705436bf8f089453445d1e9fe" +checksum = "090126dc04f95dc0d1c1c91f61bdd474b3930ca064c1edc8a849da2c6cbe1e77" dependencies = [ + "autocfg", "rawpointer", ] @@ -1299,15 +1300,6 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" -dependencies = [ - "adler", -] - -[[package]] -name = "miniz_oxide" version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" @@ -1676,9 +1668,9 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "plotters" @@ -1718,7 +1710,7 @@ dependencies = [ "crc32fast", "fdeflate", "flate2", - "miniz_oxide 0.7.1", + "miniz_oxide", ] [[package]] @@ -1848,9 +1840,9 @@ checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" [[package]] name = "quote" -version = "1.0.26" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500" dependencies = [ "proc-macro2", ] @@ -2041,20 +2033,20 @@ version = "2.56.0" dependencies = [ "anyhow", "cairo-rs", - "clap 4.2.4", + "clap 4.2.7", "librsvg", "thiserror", ] [[package]] -name = "rsvg-convert" +name = "rsvg_convert" version = "2.56.0" dependencies = [ "assert_cmd", "cairo-rs", "cast", "chrono", - "clap 4.2.4", + "clap 4.2.7", "clap_complete", "cssparser", "float-cmp", @@ -2082,9 +2074,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.14" +version = "0.37.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b864d3c18a5785a05953adeed93e2dca37ed30f18e69bba9f30079d51f363f" +checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" dependencies = [ "bitflags", "errno", @@ -2168,18 +2160,18 @@ checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" [[package]] name = "serde" -version = "1.0.160" +version = "1.0.162" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c" +checksum = "71b2f6e1ab5c2b98c05f0f35b236b22e8df7ead6ffbf51d7808da7f8817e7ab6" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.160" +version = "1.0.162" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df" +checksum = "a2a0814352fd64b58489904a44ea8d90cb1a91dcb6b4f5ebabc32c8318e93cb6" dependencies = [ "proc-macro2", "quote", @@ -2318,9 +2310,9 @@ dependencies = [ [[package]] name = "system-deps" -version = "6.0.5" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0fe581ad25d11420b873cf9aedaca0419c2b411487b134d4d21065f3d092055" +checksum = "e5fa6fb9ee296c0dc2df41a656ca7948546d061958115ddb0bcaae43ad0d17d2" dependencies = [ "cfg-expr", "heck", @@ -2402,9 +2394,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.20" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" +checksum = "8f3403384eaacbca9923fa06940178ac13e4edb725486d70e8e15881d0c836cc" dependencies = [ "itoa", "serde", @@ -2414,15 +2406,15 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" +checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" [[package]] name = "time-macros" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36" +checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" dependencies = [ "time-core", ] @@ -2845,9 +2837,9 @@ checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" [[package]] name = "winnow" -version = "0.4.1" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28" +checksum = "61de7bac303dc551fe038e2b3cef0f571087a47571ea6e79a87692ac99b99699" dependencies = [ "memchr", ] @@ -17,10 +17,10 @@ members = [ "gdk-pixbuf-loader", "librsvg-c", "rsvg", - "rsvg-convert", + "rsvg_convert", "rsvg-bench", ] default-members = [ "rsvg", - "rsvg-convert", + "rsvg_convert", ] diff --git a/Makefile.am b/Makefile.am index 27c8e342..01e68f6d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -155,12 +155,12 @@ RUST_EXTRA = \ rsvg/src/test_utils/reference_utils.rs \ rsvg-bench/Cargo.toml \ rsvg-bench/src/main.rs \ - rsvg-convert/tests/internal_predicates/file.rs \ - rsvg-convert/tests/internal_predicates/mod.rs \ - rsvg-convert/tests/internal_predicates/pdf.rs \ - rsvg-convert/tests/internal_predicates/png.rs \ - rsvg-convert/tests/internal_predicates/svg.rs \ - rsvg-convert/tests/rsvg_convert.rs \ + rsvg_convert/tests/internal_predicates/file.rs \ + rsvg_convert/tests/internal_predicates/mod.rs \ + rsvg_convert/tests/internal_predicates/pdf.rs \ + rsvg_convert/tests/internal_predicates/png.rs \ + rsvg_convert/tests/internal_predicates/svg.rs \ + rsvg_convert/tests/rsvg_convert.rs \ librsvg-c/tests/legacy_sizing.rs \ gdk-pixbuf-loader/Cargo.toml \ gdk-pixbuf-loader/src/lib.rs \ @@ -211,7 +211,7 @@ librsvg_c_api.la: $(librsvg_c_api_la_OBJECTS) $(LIBRSVG_SRC) PKG_CONFIG='$(PKG_CONFIG)' \ CARGO_TARGET_DIR=$(CARGO_TARGET_DIR) \ $(CARGO) --locked build $(CARGO_VERBOSE) $(CARGO_TARGET_ARGS) $(CARGO_RELEASE_ARGS) --package librsvg-c \ - && cd $(LIBRSVG_BUILD_DIR) && $(LINK) $< && mv $(RUST_LIB) .libs/librsvg_c_api.a + && cd $(LIBRSVG_BUILD_DIR) && $(LINK) $< && cp $(RUST_LIB) .libs/librsvg_c_api.a librsvg_@RSVG_API_MAJOR_VERSION@_la_CPPFLAGS = $(AM_CPPFLAGS) @@ -246,9 +246,9 @@ CLEANFILES += $(bin_SCRIPTS) RSVG_CONVERT_BIN=$(CARGO_TARGET_DIR)/$(RUST_TARGET_SUBDIR)/rsvg-convert$(EXEEXT) RSVG_CONVERT_SRC = \ - rsvg-convert/Cargo.toml \ - rsvg-convert/build.rs \ - rsvg-convert/src/main.rs \ + rsvg_convert/Cargo.toml \ + rsvg_convert/build.rs \ + rsvg_convert/src/main.rs \ $(NULL) $(RSVG_CONVERT_BIN): $(RSVG_CONVERT_SRC) | librsvg_c_api.la @@ -256,10 +256,10 @@ $(RSVG_CONVERT_BIN): $(RSVG_CONVERT_SRC) | librsvg_c_api.la PKG_CONFIG_ALLOW_CROSS=1 \ PKG_CONFIG='$(PKG_CONFIG)' \ CARGO_TARGET_DIR=$(CARGO_TARGET_DIR) \ - $(CARGO) --locked build $(CARGO_VERBOSE) $(CARGO_TARGET_ARGS) $(CARGO_RELEASE_ARGS) --package rsvg-convert + $(CARGO) --locked build $(CARGO_VERBOSE) $(CARGO_TARGET_ARGS) $(CARGO_RELEASE_ARGS) --package rsvg_convert rsvg-convert$(EXEEXT): $(RSVG_CONVERT_BIN) - cd $(LIBRSVG_BUILD_DIR) && mv $(RSVG_CONVERT_BIN) rsvg-convert$(EXEEXT) + cd $(LIBRSVG_BUILD_DIR) && cp $(RSVG_CONVERT_BIN) rsvg-convert$(EXEEXT) rsvg-convert.1: rsvg-convert.rst if HAVE_RST2MAN @@ -313,8 +313,8 @@ test_fixtures = \ $(wildcard $(srcdir)/rsvg/tests/fixtures/render-crash/*.svg) \ $(wildcard $(srcdir)/rsvg/tests/fixtures/text/*.svg) \ $(wildcard $(srcdir)/rsvg/tests/fixtures/dimensions/*.svg) \ - $(wildcard $(srcdir)/rsvg-convert/tests/fixtures/*.svg) \ - $(wildcard $(srcdir)/rsvg-convert/tests/fixtures/*.png) + $(wildcard $(srcdir)/rsvg_convert/tests/fixtures/*.svg) \ + $(wildcard $(srcdir)/rsvg_convert/tests/fixtures/*.png) EXTRA_DIST = \ $(LIBRSVG_SRC) \ diff --git a/rsvg-convert/Cargo.toml b/rsvg_convert/Cargo.toml index ab451cb6..035b2419 100644 --- a/rsvg-convert/Cargo.toml +++ b/rsvg_convert/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "rsvg-convert" +name = "rsvg_convert" version.workspace = true authors.workspace = true description.workspace = true @@ -9,6 +9,9 @@ repository.workspace = true edition.workspace = true rust-version.workspace = true +# So that we can use an rsvg-convert name instead of the default rsvg_convert +autobins = false + [package.metadata.system-deps] cairo-pdf = { version = "1.16", optional = true } cairo-ps = { version = "1.16", optional = true } @@ -41,3 +44,7 @@ librsvg = { path = "../rsvg", features = ["test-utils"] } [build-dependencies] system-deps = "6.0.0" + +[[bin]] +name = "rsvg-convert" +path = "src/main.rs" diff --git a/rsvg-convert/build.rs b/rsvg_convert/build.rs index eec6d526..eec6d526 100644 --- a/rsvg-convert/build.rs +++ b/rsvg_convert/build.rs diff --git a/rsvg-convert/src/main.rs b/rsvg_convert/src/main.rs index 0a8c527d..0a8c527d 100644 --- a/rsvg-convert/src/main.rs +++ b/rsvg_convert/src/main.rs diff --git a/rsvg-convert/tests/fixtures/a-link.svg b/rsvg_convert/tests/fixtures/a-link.svg index 1ae8ace5..1ae8ace5 100644 --- a/rsvg-convert/tests/fixtures/a-link.svg +++ b/rsvg_convert/tests/fixtures/a-link.svg diff --git a/rsvg-convert/tests/fixtures/accept-language-de.png b/rsvg_convert/tests/fixtures/accept-language-de.png Binary files differindex cc797dc2..cc797dc2 100644 --- a/rsvg-convert/tests/fixtures/accept-language-de.png +++ b/rsvg_convert/tests/fixtures/accept-language-de.png diff --git a/rsvg-convert/tests/fixtures/accept-language-es.png b/rsvg_convert/tests/fixtures/accept-language-es.png Binary files differindex 4cf3a21f..4cf3a21f 100644 --- a/rsvg-convert/tests/fixtures/accept-language-es.png +++ b/rsvg_convert/tests/fixtures/accept-language-es.png diff --git a/rsvg-convert/tests/fixtures/accept-language-fallback.png b/rsvg_convert/tests/fixtures/accept-language-fallback.png Binary files differindex 43b20f01..43b20f01 100644 --- a/rsvg-convert/tests/fixtures/accept-language-fallback.png +++ b/rsvg_convert/tests/fixtures/accept-language-fallback.png diff --git a/rsvg-convert/tests/fixtures/accept-language.svg b/rsvg_convert/tests/fixtures/accept-language.svg index c132b65d..c132b65d 100644 --- a/rsvg-convert/tests/fixtures/accept-language.svg +++ b/rsvg_convert/tests/fixtures/accept-language.svg diff --git a/rsvg-convert/tests/fixtures/bug521-with-viewbox.svg b/rsvg_convert/tests/fixtures/bug521-with-viewbox.svg index c3f34e6d..c3f34e6d 100644 --- a/rsvg-convert/tests/fixtures/bug521-with-viewbox.svg +++ b/rsvg_convert/tests/fixtures/bug521-with-viewbox.svg diff --git a/rsvg-convert/tests/fixtures/bug591-vbox-overflow.svg b/rsvg_convert/tests/fixtures/bug591-vbox-overflow.svg index 1cee7759..1cee7759 100644 --- a/rsvg-convert/tests/fixtures/bug591-vbox-overflow.svg +++ b/rsvg_convert/tests/fixtures/bug591-vbox-overflow.svg diff --git a/rsvg-convert/tests/fixtures/bug601-zero-stroke-width-render-only-foo.png b/rsvg_convert/tests/fixtures/bug601-zero-stroke-width-render-only-foo.png Binary files differindex 1ed070ca..1ed070ca 100644 --- a/rsvg-convert/tests/fixtures/bug601-zero-stroke-width-render-only-foo.png +++ b/rsvg_convert/tests/fixtures/bug601-zero-stroke-width-render-only-foo.png diff --git a/rsvg-convert/tests/fixtures/bug601-zero-stroke-width.svg b/rsvg_convert/tests/fixtures/bug601-zero-stroke-width.svg index ee96d474..ee96d474 100644 --- a/rsvg-convert/tests/fixtures/bug601-zero-stroke-width.svg +++ b/rsvg_convert/tests/fixtures/bug601-zero-stroke-width.svg diff --git a/rsvg-convert/tests/fixtures/bug677-partial-pixel.svg b/rsvg_convert/tests/fixtures/bug677-partial-pixel.svg index aeac8c30..aeac8c30 100644 --- a/rsvg-convert/tests/fixtures/bug677-partial-pixel.svg +++ b/rsvg_convert/tests/fixtures/bug677-partial-pixel.svg diff --git a/rsvg-convert/tests/fixtures/dimensions-in.svg b/rsvg_convert/tests/fixtures/dimensions-in.svg index aa4f3219..aa4f3219 100644 --- a/rsvg-convert/tests/fixtures/dimensions-in.svg +++ b/rsvg_convert/tests/fixtures/dimensions-in.svg diff --git a/rsvg-convert/tests/fixtures/dpi.svg b/rsvg_convert/tests/fixtures/dpi.svg index 499ee206..499ee206 100644 --- a/rsvg-convert/tests/fixtures/dpi.svg +++ b/rsvg_convert/tests/fixtures/dpi.svg diff --git a/rsvg-convert/tests/fixtures/empty.svg b/rsvg_convert/tests/fixtures/empty.svg index 01a940a2..01a940a2 100644 --- a/rsvg-convert/tests/fixtures/empty.svg +++ b/rsvg_convert/tests/fixtures/empty.svg diff --git a/rsvg-convert/tests/fixtures/example.svg b/rsvg_convert/tests/fixtures/example.svg index 850fba3e..850fba3e 100644 --- a/rsvg-convert/tests/fixtures/example.svg +++ b/rsvg_convert/tests/fixtures/example.svg diff --git a/rsvg-convert/tests/fixtures/geometry-element.svg b/rsvg_convert/tests/fixtures/geometry-element.svg index 3d707cdc..3d707cdc 100644 --- a/rsvg-convert/tests/fixtures/geometry-element.svg +++ b/rsvg_convert/tests/fixtures/geometry-element.svg diff --git a/rsvg-convert/tests/fixtures/gimp-wilber-ref.png b/rsvg_convert/tests/fixtures/gimp-wilber-ref.png Binary files differindex 606f2a4d..606f2a4d 100644 --- a/rsvg-convert/tests/fixtures/gimp-wilber-ref.png +++ b/rsvg_convert/tests/fixtures/gimp-wilber-ref.png diff --git a/rsvg-convert/tests/fixtures/gimp-wilber.svg b/rsvg_convert/tests/fixtures/gimp-wilber.svg index 97c821a7..97c821a7 100644 --- a/rsvg-convert/tests/fixtures/gimp-wilber.svg +++ b/rsvg_convert/tests/fixtures/gimp-wilber.svg diff --git a/rsvg-convert/tests/fixtures/hello-world.svg b/rsvg_convert/tests/fixtures/hello-world.svg index 45a65c0f..45a65c0f 100644 --- a/rsvg-convert/tests/fixtures/hello-world.svg +++ b/rsvg_convert/tests/fixtures/hello-world.svg diff --git a/rsvg-convert/tests/fixtures/offset-png.png b/rsvg_convert/tests/fixtures/offset-png.png Binary files differindex a4bc7e2a..a4bc7e2a 100644 --- a/rsvg-convert/tests/fixtures/offset-png.png +++ b/rsvg_convert/tests/fixtures/offset-png.png diff --git a/rsvg-convert/tests/fixtures/sub-rect-no-unit.svg b/rsvg_convert/tests/fixtures/sub-rect-no-unit.svg index fb8312ac..fb8312ac 100644 --- a/rsvg-convert/tests/fixtures/sub-rect-no-unit.svg +++ b/rsvg_convert/tests/fixtures/sub-rect-no-unit.svg diff --git a/rsvg-convert/tests/fixtures/text-a-link.svg b/rsvg_convert/tests/fixtures/text-a-link.svg index d205c768..d205c768 100644 --- a/rsvg-convert/tests/fixtures/text-a-link.svg +++ b/rsvg_convert/tests/fixtures/text-a-link.svg diff --git a/rsvg-convert/tests/fixtures/zero-offset-png.png b/rsvg_convert/tests/fixtures/zero-offset-png.png Binary files differindex adbe9524..adbe9524 100644 --- a/rsvg-convert/tests/fixtures/zero-offset-png.png +++ b/rsvg_convert/tests/fixtures/zero-offset-png.png diff --git a/rsvg-convert/tests/internal_predicates/file.rs b/rsvg_convert/tests/internal_predicates/file.rs index a7af5acf..a7af5acf 100644 --- a/rsvg-convert/tests/internal_predicates/file.rs +++ b/rsvg_convert/tests/internal_predicates/file.rs diff --git a/rsvg-convert/tests/internal_predicates/mod.rs b/rsvg_convert/tests/internal_predicates/mod.rs index 7e15354d..7e15354d 100644 --- a/rsvg-convert/tests/internal_predicates/mod.rs +++ b/rsvg_convert/tests/internal_predicates/mod.rs diff --git a/rsvg-convert/tests/internal_predicates/pdf.rs b/rsvg_convert/tests/internal_predicates/pdf.rs index f7872d71..f7872d71 100644 --- a/rsvg-convert/tests/internal_predicates/pdf.rs +++ b/rsvg_convert/tests/internal_predicates/pdf.rs diff --git a/rsvg-convert/tests/internal_predicates/png.rs b/rsvg_convert/tests/internal_predicates/png.rs index f629b510..f629b510 100644 --- a/rsvg-convert/tests/internal_predicates/png.rs +++ b/rsvg_convert/tests/internal_predicates/png.rs diff --git a/rsvg-convert/tests/internal_predicates/svg.rs b/rsvg_convert/tests/internal_predicates/svg.rs index 70473812..70473812 100644 --- a/rsvg-convert/tests/internal_predicates/svg.rs +++ b/rsvg_convert/tests/internal_predicates/svg.rs diff --git a/rsvg-convert/tests/rsvg_convert.rs b/rsvg_convert/tests/rsvg_convert.rs index f58edf6c..f58edf6c 100644 --- a/rsvg-convert/tests/rsvg_convert.rs +++ b/rsvg_convert/tests/rsvg_convert.rs |