SPItem::getBounds now always returns a Geom::Rect boundingbox.

(bzr r6517)

2 files changed, 6 insertions, 9 deletions

diff --git a/src/live_effects/lpe-mirror_symmetry.cpp b/src/live_effects/lpe-mirror_symmetry.cpp
index a70ab507f..834877f36 100644
--- a/src/live_effects/lpe-mirror_symmetry.cpp
+++ b/src/live_effects/lpe-mirror_symmetry.cpp
@@ -47,10 +47,10 @@ LPEMirrorSymmetry::doOnApply (SPLPEItem *lpeitem)
 
     SPItem *item = SP_ITEM(lpeitem);
     Geom::Matrix t = sp_item_i2d_affine(item);
-    NR::Maybe<Geom::Rect> bbox = item->getBounds(t);
+    Geom::Rect bbox = item->getBounds(t);
 
-    Point A(bbox->left(), bbox->bottom());
-    Point B(bbox->left(), bbox->top());
+    Point A(bbox.left(), bbox.bottom());
+    Point B(bbox.left(), bbox.top());
     A *= t;
     B *= t;
     Piecewise<D2<SBasis> > rline = Piecewise<D2<SBasis> >(D2<SBasis>(Linear(A[X], B[X]), Linear(A[Y], B[Y])));
diff --git a/src/live_effects/lpegroupbbox.cpp b/src/live_effects/lpegroupbbox.cpp
index 2ea839892..c0f1222f2 100644
--- a/src/live_effects/lpegroupbbox.cpp
+++ b/src/live_effects/lpegroupbbox.cpp
@@ -28,13 +28,10 @@ GroupBBoxEffect::original_bbox(SPLPEItem *lpeitem, bool absolute)
     else {
         transform = Geom::identity();
     }
-    
-    NR::Maybe<NR::Rect> itemBBox = item->getBounds(from_2geom(transform), SPItem::GEOMETRIC_BBOX);
 
-    // NR to Geom glue
-    Geom::Rect geomBBox = Geom::Rect(itemBBox->min(), itemBBox->max());
-    boundingbox_X = geomBBox[Geom::X];
-    boundingbox_Y = geomBBox[Geom::Y];
+    Geom::Rect itemBBox = item->getBounds(transform, SPItem::GEOMETRIC_BBOX);
+    boundingbox_X = itemBBox[Geom::X];
+    boundingbox_Y = itemBBox[Geom::Y];
 }
 
 } // namespace LivePathEffect