support for transform elements (Bug 600473)

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

diff --git a/src/sp-use.cpp b/src/sp-use.cpp
index 134588e659c78071a68ec9859e01c71f75c9ca85..9cd38e4b3e70b5ebf7e87734a2feb1073a8604c8 100644 (file)
--- a/src/sp-use.cpp
+++ b/src/sp-use.cpp
@@ -52,7 +52,7 @@ static void sp_use_update(SPObject *object, SPCtx *ctx, guint flags);
 static void sp_use_modified(SPObject *object, guint flags);
 
 static void sp_use_bbox(SPItem const *item, NRRect *bbox, Geom::Matrix const &transform, unsigned const flags);
-static void sp_use_snappoints(SPItem const *item, SnapPointsIter p, Inkscape::SnapPreferences const *snapprefs);
+static void sp_use_snappoints(SPItem const *item, std::vector<Inkscape::SnapCandidatePoint> &p, Inkscape::SnapPreferences const *snapprefs);
 static void sp_use_print(SPItem *item, SPPrintContext *ctx);
 static gchar *sp_use_description(SPItem *item);
 static NRArenaItem *sp_use_show(SPItem *item, NRArena *arena, unsigned key, unsigned flags);
@@ -288,7 +288,14 @@ sp_use_bbox(SPItem const *item, NRRect *bbox, Geom::Matrix const &transform, uns
                              * Geom::Translate(use->x.computed,
                                                use->y.computed)
                              * transform );
-        sp_item_invoke_bbox_full(child, bbox, ct, flags, FALSE);
+        Geom::OptRect optbbox;
+        sp_item_invoke_bbox_full(child, optbbox, ct, flags, FALSE);
+        if (optbbox) {
+            bbox->x0 = (*optbbox)[0][0];
+            bbox->y0 = (*optbbox)[1][0];
+            bbox->x1 = (*optbbox)[0][1];
+            bbox->y1 = (*optbbox)[1][1];
+        }
     }
 }
 
@@ -356,7 +363,7 @@ sp_use_show(SPItem *item, NRArena *arena, unsigned key, unsigned flags)
         }
         Geom::Translate t(use->x.computed,
                         use->y.computed);
-        nr_arena_group_set_child_transform(NR_ARENA_GROUP(ai), NR::Matrix(t));
+        nr_arena_group_set_child_transform(NR_ARENA_GROUP(ai), Geom::Matrix(t));
     }
 
     return ai;
@@ -388,10 +395,11 @@ SPItem *
 sp_use_root(SPUse *use)
 {
     SPObject *orig = use->child;
-    while (SP_IS_USE(orig)) {
+    while (orig && SP_IS_USE(orig)) {
         orig = SP_USE(orig)->child;
     }
-    g_return_val_if_fail(SP_IS_ITEM(orig), NULL);
+    if (!orig || !SP_IS_ITEM(orig))
+        return NULL;
     return SP_ITEM(orig);
 }
 
@@ -741,16 +749,17 @@ sp_use_get_original(SPUse *use)
 }
 
 static void
-sp_use_snappoints(SPItem const *item, SnapPointsIter p, Inkscape::SnapPreferences const *snapprefs)
+sp_use_snappoints(SPItem const *item, std::vector<Inkscape::SnapCandidatePoint> &p, Inkscape::SnapPreferences const *snapprefs)
 {
     g_assert (item != NULL);
     g_assert (SP_IS_ITEM(item));
     g_assert (SP_IS_USE(item));
-    
+
     SPUse *use = SP_USE(item);
     SPItem *root = sp_use_root(use);
-    g_return_if_fail(root);
-    
+    if (!root)
+        return;
+
     SPItemClass const &item_class = *(SPItemClass const *) G_OBJECT_GET_CLASS(root);
     if (item_class.snappoints) {
         item_class.snappoints(root, p, snapprefs);