Make curvature work again by fixing a minor omission

[inkscape.git] / src / sp-mask.cpp

diff --git a/src/sp-mask.cpp b/src/sp-mask.cpp
index c6febeb40280c9204a5d6d48b969e48be68b5958..20cb38297c126fd07e93a27c1e6687accfc21575 100644 (file)
--- a/src/sp-mask.cpp
+++ b/src/sp-mask.cpp
@@ -186,7 +186,6 @@ sp_mask_child_added (SPObject *object, Inkscape::XML::Node *child, Inkscape::XML
                                                               SP_ITEM_REFERENCE_FLAGS);
                        if (ac) {
                                nr_arena_item_add_child (v->arenaitem, ac, NULL);
-                               nr_arena_item_unref (ac);
                        }
                }
        }
@@ -220,7 +219,7 @@ sp_mask_update (SPObject *object, SPCtx *ctx, guint flags)
        SPMask *mask = SP_MASK (object);
        for (SPMaskView *v = mask->display; v != NULL; v = v->next) {
                if (mask->maskContentUnits == SP_CONTENT_UNITS_OBJECTBOUNDINGBOX) {
-            NR::Matrix t(NR::scale(v->bbox.x1 - v->bbox.x0, v->bbox.y1 - v->bbox.y0));
+            Geom::Matrix t(Geom::Scale(v->bbox.x1 - v->bbox.x0, v->bbox.y1 - v->bbox.y0));
                        t[4] = v->bbox.x0;
                        t[5] = v->bbox.y0;
                        nr_arena_group_set_child_transform (NR_ARENA_GROUP (v->arenaitem), &t);
@@ -271,7 +270,7 @@ sp_mask_write (SPObject *object, Inkscape::XML::Document *xml_doc, Inkscape::XML
 
 // Create a mask element (using passed elements), add it to <defs>
 const gchar *
-sp_mask_create (GSList *reprs, SPDocument *document, NR::Matrix const* applyTransform)
+sp_mask_create (GSList *reprs, SPDocument *document, Geom::Matrix const* applyTransform)
 {
     Inkscape::XML::Node *defsrepr = SP_OBJECT_REPR (SP_DOCUMENT_DEFS (document));
 
@@ -288,7 +287,7 @@ sp_mask_create (GSList *reprs, SPDocument *document, NR::Matrix const* applyTran
         SPItem *item = SP_ITEM(mask_object->appendChildRepr(node));
         
         if (NULL != applyTransform) {
-            NR::Matrix transform (item->transform);
+            Geom::Matrix transform (item->transform);
             transform *= (*applyTransform);
             sp_item_write_transform(item, SP_OBJECT_REPR(item), transform);
         }
@@ -318,13 +317,12 @@ sp_mask_show (SPMask *mask, NRArena *arena, unsigned int key)
                        if (ac) {
                                /* The order is not important in mask */
                                nr_arena_item_add_child (ai, ac, NULL);
-                               nr_arena_item_unref (ac);
                        }
                }
        }
 
        if (mask->maskContentUnits == SP_CONTENT_UNITS_OBJECTBOUNDINGBOX) {
-        NR::Matrix t(NR::scale(mask->display->bbox.x1 - mask->display->bbox.x0, mask->display->bbox.y1 - mask->display->bbox.y0));
+        Geom::Matrix t(Geom::Scale(mask->display->bbox.x1 - mask->display->bbox.x0, mask->display->bbox.y1 - mask->display->bbox.y0));
                t[4] = mask->display->bbox.x0;
                t[5] = mask->display->bbox.y0;
                nr_arena_group_set_child_transform (NR_ARENA_GROUP (ai), &t);