[librsvg: 33/33] Merge branch 'merge-crates' into 'master'




commit 21f64ff4e0dd76c9f77c5eab30d5a48801b135fc
Merge: 805eb7dd f170a4ec
Author: Federico Mena Quintero <federico mena gmail com>
Date:   Mon Nov 2 16:59:43 2020 +0000

    Merge branch 'merge-crates' into 'master'
    
    Merge crates
    
    Closes #640
    
    See merge request GNOME/librsvg!425

 .gitlab-ci.yml                                     |   2 +-
 Cargo.lock                                         | 122 +++-------
 Cargo.toml                                         | 120 +++++++++-
 Makefile.am                                        | 245 ++++++++++-----------
 {rsvg_internals/benches => benches}/box_blur.rs    |   2 +-
 {rsvg_internals/benches => benches}/composite.rs   |   2 +-
 {rsvg_internals/benches => benches}/lighting.rs    |   2 +-
 {rsvg_internals/benches => benches}/path_parser.rs |   6 +-
 .../benches => benches}/pixbuf_from_surface.rs     |   4 +-
 .../benches => benches}/pixel_iterators.rs         |   2 +-
 {rsvg_internals/benches => benches}/pixel_ops.rs   |   2 +-
 {rsvg_internals/benches => benches}/srgb.rs        |   2 +-
 .../benches => benches}/surface_from_pixbuf.rs     |   2 +-
 rsvg_internals/build.rs => build.rs                |  73 +++++-
 configure.ac                                       |   4 +-
 doc/Makefile.am                                    |   8 +-
 doc/rsvg.types                                     |   2 +-
 librsvg_crate/example.svg => example.svg           |   0
 .../examples => examples}/proportional.rs          |   0
 gdk-pixbuf-loader/Makefile.am                      |   2 +-
 gdk-pixbuf-loader/io-svg.c                         |   2 +-
 {librsvg => include}/.dirstamp                     |   0
 {librsvg => include}/rsvg-cairo.h                  |   0
 {librsvg => include}/rsvg-css.h                    |   0
 {librsvg => include}/rsvg-features.h               |   0
 {librsvg => include}/rsvg-version.h.in             |   0
 {librsvg => include}/rsvg.h                        |   0
 librsvg/Cargo.toml                                 |  41 ----
 librsvg/build.rs                                   |  63 ------
 librsvg_crate/Cargo.toml                           |  22 --
 librsvg_crate/tests/standalone/main.rs             |   5 -
 librsvg_crate/tests/standalone/utils.rs            |  39 ----
 po/POTFILES.in                                     | 158 +++++++------
 rsvg-c-srcs.mk                                     |  10 +-
 rsvg-convert.c                                     |   4 +-
 rsvg_internals/Cargo.toml                          |  87 --------
 {rsvg_internals/src => src}/angle.rs               |   0
 librsvg_crate/src/lib.rs => src/api.rs             |  21 +-
 {rsvg_internals/src => src}/aspect_ratio.rs        |   4 +-
 {rsvg_internals/src => src}/attributes.rs          |   8 +-
 {rsvg_internals/src => src}/bbox.rs                |   0
 {librsvg => src/c_api}/color_utils.rs              |   2 +-
 {librsvg => src/c_api}/dpi.rs                      |   6 +-
 librsvg/c_api.rs => src/c_api/handle.rs            |  40 ++--
 {librsvg => src/c_api}/messages.rs                 |   0
 librsvg/lib.rs => src/c_api/mod.rs                 |  11 +-
 {librsvg => src/c_api}/pixbuf_utils.rs             |  16 +-
 {librsvg => src/c_api}/sizing.rs                   |   6 +-
 {rsvg_internals/src => src}/color.rs               |   0
 {rsvg_internals/src => src}/cond.rs                |   0
 {rsvg_internals/src => src}/coord_units.rs         |   0
 {rsvg_internals/src => src}/css.rs                 |  10 +-
 {rsvg_internals/src => src}/dasharray.rs           |   0
 {rsvg_internals/src => src}/document.rs            |   2 +-
 {rsvg_internals/src => src}/dpi.rs                 |   0
 {rsvg_internals/src => src}/drawing_ctx.rs         |  40 ++--
 {rsvg_internals/src => src}/element.rs             |  50 ++---
 {rsvg_internals/src => src}/error.rs               |   6 +-
 {rsvg_internals/src => src}/filter.rs              |   4 +-
 {rsvg_internals/src => src}/filters/blend.rs       |   2 +-
 {rsvg_internals/src => src}/filters/bounds.rs      |   0
 .../src => src}/filters/color_matrix.rs            |   2 +-
 .../src => src}/filters/component_transfer.rs      |   2 +-
 {rsvg_internals/src => src}/filters/composite.rs   |   2 +-
 {rsvg_internals/src => src}/filters/context.rs     |   4 +-
 .../src => src}/filters/convolve_matrix.rs         |   2 +-
 .../src => src}/filters/displacement_map.rs        |   2 +-
 {rsvg_internals/src => src}/filters/error.rs       |   0
 {rsvg_internals/src => src}/filters/flood.rs       |   2 +-
 .../src => src}/filters/gaussian_blur.rs           |   2 +-
 {rsvg_internals/src => src}/filters/image.rs       |   6 +-
 {rsvg_internals/src => src}/filters/lighting.rs    |   2 +-
 {rsvg_internals/src => src}/filters/merge.rs       |   4 +-
 {rsvg_internals/src => src}/filters/mod.rs         |   8 +-
 {rsvg_internals/src => src}/filters/morphology.rs  |   2 +-
 {rsvg_internals/src => src}/filters/offset.rs      |   2 +-
 {rsvg_internals/src => src}/filters/tile.rs        |   2 +-
 {rsvg_internals/src => src}/filters/turbulence.rs  |   2 +-
 {rsvg_internals/src => src}/float_eq_cairo.rs      |   0
 {rsvg_internals/src => src}/font_props.rs          |   2 +-
 {rsvg_internals/src => src}/gradient.rs            |   2 +-
 {rsvg_internals/src => src}/handle.rs              |   0
 {rsvg_internals/src => src}/href.rs                |   6 +-
 {rsvg_internals/src => src}/image.rs               |   2 +-
 {rsvg_internals/src => src}/io.rs                  |   0
 {rsvg_internals/src => src}/iri.rs                 |   0
 {rsvg_internals/src => src}/length.rs              |  14 +-
 {rsvg_internals/src => src}/lib.rs                 |  26 +--
 {rsvg_internals/src => src}/limits.rs              |   0
 {rsvg_internals/src => src}/log.rs                 |   0
 {rsvg_internals/src => src}/marker.rs              |   6 +-
 {rsvg_internals/src => src}/node.rs                |  20 +-
 {rsvg_internals/src => src}/number_list.rs         |   2 +-
 {rsvg_internals/src => src}/paint_server.rs        |   2 +-
 {rsvg_internals/src => src}/parsers.rs             |   4 +-
 {rsvg_internals/src => src}/path_builder.rs        |   2 +-
 {rsvg_internals/src => src}/path_parser.rs         |   2 +-
 {rsvg_internals/src => src}/pattern.rs             |   2 +-
 {rsvg_internals/src => src}/properties.rs          |   0
 {rsvg_internals/src => src}/property_defs.rs       |   2 +-
 {rsvg_internals/src => src}/property_macros.rs     |   0
 {rsvg_internals/src => src}/rect.rs                |   0
 {rsvg_internals/src => src}/shapes.rs              |  16 +-
 {rsvg_internals/src => src}/space.rs               |   0
 {rsvg_internals/src => src}/structure.rs           |  10 +-
 {rsvg_internals/src => src}/style.rs               |   0
 .../src => src}/surface_utils/compare_surfaces.rs  |   0
 .../src => src}/surface_utils/iterators.rs         |   2 +-
 {rsvg_internals/src => src}/surface_utils/mod.rs   |   3 +-
 .../src => src}/surface_utils/shared_surface.rs    |  10 +-
 {rsvg_internals/src => src}/surface_utils/srgb.rs  |   0
 {rsvg_internals/src => src}/test_utils.rs          |   0
 {rsvg_internals/src => src}/text.rs                |  12 +-
 {rsvg_internals/src => src}/transform.rs           |   4 +-
 {rsvg_internals/src => src}/ua.css                 |   0
 {rsvg_internals/src => src}/unit_interval.rs       |   0
 {rsvg_internals/src => src}/url_resolver.rs        |   2 +-
 {rsvg_internals/src => src}/util.rs                |   0
 {rsvg_internals/src => src}/viewbox.rs             |   0
 {rsvg_internals/src => src}/xml.rs                 |   0
 {rsvg_internals/src => src}/xml2.rs                |   0
 {rsvg_internals/src => src}/xml2_load.rs           |   3 +-
 tests/Cargo.toml                                   |  30 ---
 tests/Makefile.am                                  |  52 +++--
 tests/api.c                                        |   2 +-
 tests/build.rs                                     |   2 +
 .../tests/standalone => tests/src}/api.rs          |   6 +-
 .../tests/standalone => tests/src}/bugs.rs         |   8 +-
 tests/src/cmdline/rsvg_convert.rs                  | 120 +++++-----
 tests/src/errors.rs                                |   6 +-
 .../src}/intrinsic_dimensions.rs                   |   5 +-
 tests/src/loading_crash.rs                         |   6 +-
 tests/src/main.rs                                  |  13 ++
 .../tests/standalone => tests/src}/primitives.rs   |   6 +-
 tests/src/reference.rs                             |  14 +-
 tests/src/render_crash.rs                          |   6 +-
 tests/src/utils.rs                                 |  63 ++++--
 137 files changed, 827 insertions(+), 975 deletions(-)
---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]