[librsvg: 20/20] Merge branch 'namespaces'
- From: Federico Mena Quintero <federico src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [librsvg: 20/20] Merge branch 'namespaces'
- Date: Sat, 26 Oct 2019 23:36:34 +0000 (UTC)
commit 4e98718245df08cdce415a5a494b28a544be372f
Merge: 9fa24530 dceecd12
Author: Federico Mena Quintero <federico gnome org>
Date: Sat Oct 26 18:14:11 2019 -0500
Merge branch 'namespaces'
Cargo.lock | 422 +++++++++++++--------
NEWS | 16 +
rsvg_internals/Cargo.toml | 2 +-
rsvg_internals/src/clip_path.rs | 6 +-
rsvg_internals/src/create_node.rs | 51 ++-
rsvg_internals/src/css.rs | 12 +-
rsvg_internals/src/error.rs | 20 +-
rsvg_internals/src/filters/blend.rs | 10 +-
rsvg_internals/src/filters/color_matrix.rs | 16 +-
rsvg_internals/src/filters/component_transfer.rs | 20 +-
rsvg_internals/src/filters/composite.rs | 16 +-
rsvg_internals/src/filters/convolve_matrix.rs | 28 +-
rsvg_internals/src/filters/displacement_map.rs | 14 +-
rsvg_internals/src/filters/gaussian_blur.rs | 6 +-
rsvg_internals/src/filters/image.rs | 8 +-
rsvg_internals/src/filters/input.rs | 4 +-
rsvg_internals/src/filters/light/light_source.rs | 34 +-
rsvg_internals/src/filters/light/lighting.rs | 18 +-
rsvg_internals/src/filters/merge.rs | 6 +-
rsvg_internals/src/filters/mod.rs | 18 +-
rsvg_internals/src/filters/morphology.rs | 10 +-
rsvg_internals/src/filters/node.rs | 18 +-
rsvg_internals/src/filters/offset.rs | 8 +-
rsvg_internals/src/filters/turbulence.rs | 18 +-
rsvg_internals/src/gradient.rs | 43 ++-
rsvg_internals/src/image.rs | 16 +-
rsvg_internals/src/link.rs | 6 +-
rsvg_internals/src/marker.rs | 20 +-
rsvg_internals/src/mask.rs | 16 +-
rsvg_internals/src/node.rs | 28 +-
rsvg_internals/src/parsers.rs | 4 +-
rsvg_internals/src/pattern.rs | 27 +-
rsvg_internals/src/properties.rs | 110 +++---
rsvg_internals/src/property_bag.rs | 163 +++++---
rsvg_internals/src/shapes.rs | 50 +--
rsvg_internals/src/structure.rs | 34 +-
rsvg_internals/src/style.rs | 4 +-
rsvg_internals/src/text.rs | 26 +-
rsvg_internals/src/util.rs | 8 +
rsvg_internals/src/xml.rs | 117 +++---
rsvg_internals/src/xml2.rs | 77 ++--
rsvg_internals/src/xml2_load.rs | 135 +++++--
tests/fixtures/errors/308-doubly-recursive-use.svg | 2 +-
tests/fixtures/errors/308-recursive-use.svg | 2 +-
tests/fixtures/errors/308-use-self-ref.svg | 2 +-
.../infinite-loop/341-recursive-pattern.svg | 2 +-
.../infinite-loop/398-recursive-gradient.svg | 2 +-
.../fixtures/render-crash/338-zero-sized-image.svg | 2 +-
.../render-crash/342-use-references-ancestor.svg | 2 +-
.../497-path-with-all-invalid-commands.svg | 2 +-
.../render-crash/777155-zero-sized-pattern.svg | 8 +-
51 files changed, 974 insertions(+), 715 deletions(-)
---
diff --cc rsvg_internals/src/shapes.rs
index a5eb5354,7c2e00f1..e8178a63
--- a/rsvg_internals/src/shapes.rs
+++ b/rsvg_internals/src/shapes.rs
@@@ -120,8 -120,10 +120,8 @@@ pub struct NodePath
impl NodeTrait for NodePath {
fn set_atts(&mut self, _: Option<&RsvgNode>, pbag: &PropertyBag<'_>) -> NodeResult {
for (attr, value) in pbag.iter() {
- if attr == local_name!("d") {
+ if attr.expanded() == expanded_name!(svg "d") {
- let mut builder = PathBuilder::new();
-
- if let Err(e) = path_parser::parse_path_into_builder(value, &mut builder) {
+ if let Err(e) = path_parser::parse_path_into_builder(value, &mut self.builder) {
// FIXME: we don't propagate errors upstream, but creating a partial
// path is OK per the spec
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]