summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Use #include <librsvg/blah.h> in rsvg.hFederico Mena Quintero2020-11-066-11/+7
| | | | | | | | This way we can avoid -I$(top_builddir)/include/librsvg everywhere just so that header can pick up rsvg-version.h, the only generated header file. Also, it seems more correct, e.g. GTK does it that way?
* (#645) - Make include paths happy againFederico Mena Quintero2020-11-0615-18/+28
| | | | | | | | | | Move headers to include/librsvg/*.h to keep both gtk-doc and g-ir-scanner happy. We want to end up with a Rsvg-2.0.gir with a line like <c:include name="librsvg/rsvg.h"/> Fixes https://gitlab.gnome.org/GNOME/librsvg/-/issues/645
* Merge branch 'gitlab-clippy-invocation' into 'master'Sven Neumann2020-11-061-4/+4
|\ | | | | | | | | ci: Adjust gitlab-clippy invocation See merge request GNOME/librsvg!439
| * ci: Adjust gitlab-clippy invocationSven Neumann2020-11-061-4/+4
|/ | | | | | | The gitlab-clippy command-line tool behavior changed with the new version, adjust the way we call it. Also remove the obsolete --workspace argument for cargo.
* Merge branch '642-text-dx-dy' into 'master'Federico Mena Quintero2020-11-053-61/+86
|\ | | | | | | | | | | | | #642 - Fix dx/dy offsets in nested <tspan> elements Closes #642 See merge request GNOME/librsvg!435
| * text: Don't create Spans for chars nodes that end up as empty strings after ↵Federico Mena Quintero2020-11-043-13/+34
| | | | | | | | | | | | | | xml:space normalization The new test fails without this commit; it creates inter-line spacings in the second <text> element.
| * text: Only push a new chunk if the tspan has any of x or y attributesFederico Mena Quintero2020-11-041-8/+7
| |
| * text: Propagate dx/dy across nested <tspan>Federico Mena Quintero2020-11-041-2/+9
| |
| * text: normalize some lengths as early as possibleFederico Mena Quintero2020-11-041-48/+46
|/ | | | | | | Don't keep dx/dy in the structs as Option<Length<...>>; keep them as f64. x/y need to be kept as Option<f64> because they affect chunking.
* Merge branch 'bench' into 'master'Federico Mena Quintero2020-11-043-6/+35
|\ | | | | | | | | ci: add bench tests to CI See merge request GNOME/librsvg!433
| * Add bench tests to CIDunja Lalic2020-11-041-0/+25
| |
| * Make benchmarking modules semi-privateDunja Lalic2020-11-042-6/+10
|/
* Merge branch 'loader-api-builder-pattern' into 'master'Federico Mena Quintero2020-11-042-17/+9
|\ | | | | | | | | Fix API for building a Loader See merge request GNOME/librsvg!434
| * Fix API for building a LoaderSven Neumann2020-11-042-17/+9
|/
* Merge branch 'alatiera/allow-warnings' into 'master'Sven Neumann2020-11-031-17/+7
|\ | | | | | | | | ci: turn rustc warnings into errors in the CI See merge request GNOME/librsvg!432
| * ci: turn rustc warnings into errors in the CIJordan Petridis2020-11-031-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | followup of !431 [1] deny(warnings) is an anti-pattern as a newer release of the compiler can cause working/released builds to stop compilling for downstreams. Having to export a RUST_FLAG is not the prettiest, but its the best we got atm [2] [1] https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/431 [2] https://github.com/rust-lang/cargo/issues/3591
| * ci: replace .common template with default keyJordan Petridis2020-11-031-17/+5
|/ | | | | | | Useful note, default inheritence can be disabled if needed with `inherit: default:` or straight overwritten. https://docs.gitlab.com/ce/ci/yaml/README.html#global-defaults
* Merge branch 'no-deny-warnings' into 'master'Federico Mena Quintero2020-11-031-1/+0
|\ | | | | | | | | Remove deny(warnings) from the toplevel src/lib.rs See merge request GNOME/librsvg!431
| * Remove deny(warnings) from the toplevel src/lib.rsFederico Mena Quintero2020-11-031-1/+0
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This got moved from librsvg_crate/src/lib.rs, where it was presumably because we didn't want warnings in the public API crate. Now that we have a single crate, however, this can create warnings on architectures which we don't test in the CI. Specifically, this was causing this warning-as-error in gnome-build-meta for aarch64: ====================================================================== 345 | | rsvg_pixbuf_from_file_at_max_size => ptr::null_mut(); 346 | | 347 | | !filename.is_null(), 348 | | max_width >= 1 && max_height >= 1, 349 | | error.is_null() || (*error).is_null(), 350 | | } | |_____- in this macro invocation | = help: cast can be replaced by coercion; this might require a temporary variable = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info) error: trivial cast: `*const u8` as `*const u8` --> src/c_api/messages.rs:112:21 | 112 | concat!(stringify!($func_name), "\0").as_ptr() as *const _, | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ::: src/c_api/pixbuf_utils.rs:344:5 | 344 | / rsvg_return_val_if_fail! { 345 | | rsvg_pixbuf_from_file_at_max_size => ptr::null_mut(); 346 | | 347 | | !filename.is_null(), 348 | | max_width >= 1 && max_height >= 1, 349 | | error.is_null() || (*error).is_null(), 350 | | } | |_____- in this macro invocation
* Merge branch 'xml' into 'master'Federico Mena Quintero2020-11-036-11/+14
|\ | | | | | | | | Move xml code to a module See merge request GNOME/librsvg!428
| * Move xml code to a modulePaolo Borelli2020-11-036-11/+14
|/
* Merge branch 'automake-dist-cleanup' into 'master'Federico Mena Quintero2020-11-032-30/+32
|\ | | | | | | | | Automake dist cleanup See merge request GNOME/librsvg!430
| * doc: Remove rsvg.actions on 'make distclean'Sven Neumann2020-11-031-1/+1
| | | | | | | | | | | | The latest version of gtk-doc seems to create this (empty) file when running rsvg-scan, but it's not removed on distclean leading to an error on 'make distcheck'.
| * tests: use EXTRA_DIST for test resourcesSven Neumann2020-11-031-29/+31
|/ | | | | | | | | Use EXTRA_DIST instead of "dist_installed_test_data" as provided by glib-tap.mk. The test files are mostly used by "cargo test" now and having them listed as "dist_installed_test_data" adds hundreds of dependencies to 'make check' causing lots of noise in the output. Also do not redefine NULL, it's already defined in glib-tap.mk.
* Merge branch 'ci-cache-cleanup' into 'master'Sven Neumann2020-11-031-12/+22
|\ | | | | | | | | ci: Disable cache for 'cargo fmt', it doesn't need it See merge request GNOME/librsvg!429
| * ci: Disable cache for 'cargo fmt', it doesn't need itSven Neumann2020-11-031-12/+22
|/ | | | | Make .cache a build configuration that is explicitly pulled in by jobs that need the cache. Rename .recreate_cache to .cache_push.
* Merge branch 'fixup-gitignore' into 'master'Sven Neumann2020-11-031-1/+2
|\ | | | | | | | | Adjust location of generated rsvg-version.h in .gitignore See merge request GNOME/librsvg!427
| * Adjust location of generated rsvg-version.h in .gitignoreSven Neumann2020-11-031-1/+2
|/
* Merge branch 'fix-cargo-test-cmdline' into 'master'Sven Neumann2020-11-021-1/+1
|\ | | | | | | | | tests: Fix 'cargo test cmdline' after the crates merge See merge request GNOME/librsvg!426
| * tests: Fix 'cargo test cmdline' after the crates mergeSven Neumann2020-11-021-1/+1
|/
* Merge branch 'merge-crates' into 'master'Federico Mena Quintero2020-11-02137-975/+827
|\ | | | | | | | | | | | | Merge crates Closes #640 See merge request GNOME/librsvg!425
| * Fix imports in benchesFederico Mena Quintero2020-10-3010-12/+14
| |
| * Fix tooling references to rsvg_internalsFederico Mena Quintero2020-10-302-86/+99
| |
| * Don't run the reference/loading_crash/render_crash tests in the "cargo test" ↵Federico Mena Quintero2020-10-301-1/+1
| | | | | | | | stage
| * Remove package names in the CI; there is a single crate now.Federico Mena Quintero2020-10-301-1/+1
| |
| * Fix include path in tests/api.cFederico Mena Quintero2020-10-301-1/+1
| |
| * Add tests/ to all paths to fixtures in the rsvg-convert testsFederico Mena Quintero2020-10-301-60/+60
| | | | | | | | I hope I'm not butchering this...
| * Trivial casts in testsFederico Mena Quintero2020-10-301-4/+4
| |
| * Missing lifetime in testsFederico Mena Quintero2020-10-301-1/+1
| |
| * Fix gtk-doc buildFederico Mena Quintero2020-10-302-5/+5
| |
| * Fix includes in gdk-pixbuf-loaderFederico Mena Quintero2020-10-302-2/+2
| |
| * Fix RUST_LIB name in Makefile.amFederico Mena Quintero2020-10-301-2/+2
| |
| * Start fixing autotoolsFederico Mena Quintero2020-10-3011-151/+135
| | | | | | | | Rename librsvg/ to include/ since now it only has header files.
| * Remove librsvg/lib.rsFederico Mena Quintero2020-10-301-57/+0
| |
| * Rename c_api.rs to handle.rs to avoid module inceptionFederico Mena Quintero2020-10-304-4/+4
| | | | | | | | Besides, it's RsvgHandle that that module implements.
| * cargo fmtFederico Mena Quintero2020-10-306-18/+7
| |
| * Fix warnings about trivial castsFederico Mena Quintero2020-10-306-29/+37
| | | | | | | | Not entirely happy about the pointer ones, but hey.
| * Fix warnings about deprecated lifetime elisionFederico Mena Quintero2020-10-3043-110/+110
| |
| * Move options for warnings to lib.rs as they need to be in the toplevelFederico Mena Quintero2020-10-302-8/+8
| |
| * Adjust imports in c_api codeFederico Mena Quintero2020-10-305-22/+23
| |