From 362bc9381011284b458dc7815ec77ca1d74e5935 Mon Sep 17 00:00:00 2001
From: "Johan B. C. Engelen" <jbc.engelen@swissonline.ch>
Date: Tue, 8 Jul 2008 20:18:44 +0000
Subject: 2geomify SPCurve::new_from_rect

(bzr r6235)
---
 src/sp-image.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/sp-image.cpp')

diff --git a/src/sp-image.cpp b/src/sp-image.cpp
index f2f2265ea..2dc3bfb27 100644
--- a/src/sp-image.cpp
+++ b/src/sp-image.cpp
@@ -23,6 +23,8 @@
 #include <libnr/nr-matrix-ops.h>
 #include <libnr/nr-translate-matrix-ops.h>
 #include <libnr/nr-scale-translate-ops.h>
+#include <libnr/nr-convert2geom.h>
+#include <2geom/rect.h>
 //#define GDK_PIXBUF_ENABLE_BACKEND 1
 //#include <gdk-pixbuf/gdk-pixbuf-io.h>
 #include "display/nr-arena-image.h"
@@ -1518,8 +1520,8 @@ sp_image_set_curve(SPImage *image)
     
     NRRect rect;
 	sp_image_bbox(image, &rect, NR::identity(), 0);
-	NR::Maybe<NR::Rect> rect2 = rect.upgrade();
-	SPCurve *c = SPCurve::new_from_rect(rect2);
+    Geom::Rect rect2 = to_2geom(*rect.upgrade());
+    SPCurve *c = SPCurve::new_from_rect(rect2);
         
     if (image->curve) {
         image->curve = image->curve->unref();
-- 
cgit v1.2.3