diff options
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | src/sp-mask.h | 34 |
2 files changed, 34 insertions, 1 deletions
@@ -80,6 +80,7 @@ Adrian Knoth Krzysztof Kosiński Petr Kovar Benoît Lavorata +Alex Leone Julien Leray Raph Levien Diederik van Lierop diff --git a/src/sp-mask.h b/src/sp-mask.h index d5bddd332..0b995f0ce 100644 --- a/src/sp-mask.h +++ b/src/sp-mask.h @@ -26,6 +26,7 @@ class SPMaskView; #include "libnr/nr-forward.h" #include "sp-object-group.h" #include "uri-references.h" +#include "xml/node.h" struct SPMask : public SPObjectGroup { unsigned int maskUnits_set : 1; @@ -50,8 +51,39 @@ public: return (SPMask *)URIReference::getObject(); } protected: + /** + * If the owner element of this reference (the element with <... mask="...">) + * is a child of the mask it refers to, return false. + * \return false if obj is not a mask or if obj is a parent of this + * reference's owner element. True otherwise. + */ virtual bool _acceptObject(SPObject *obj) const { - return SP_IS_MASK(obj); + if (!SP_IS_MASK(obj)) { + return false; + } + SPObject * const owner = this->getOwner(); + if (obj->isAncestorOf(owner)) { + Inkscape::XML::Node * const owner_repr = owner->repr; + Inkscape::XML::Node * const obj_repr = obj->repr; + gchar const * owner_name = NULL; + gchar const * owner_mask = NULL; + gchar const * obj_name = NULL; + gchar const * obj_id = NULL; + if (owner_repr != NULL) { + owner_name = owner_repr->name(); + owner_mask = owner_repr->attribute("mask"); + } + if (obj_repr != NULL) { + obj_name = obj_repr->name(); + obj_id = obj_repr->attribute("id"); + } + g_warning("Ignoring recursive mask reference " + "<%s mask=\"%s\"> in <%s id=\"%s\">", + owner_name, owner_mask, + obj_name, obj_id); + return false; + } + return true; } }; |