Fix behavior when loading a document

[inkscape.git] / src / libnr / nr-convert2geom.h

diff --git a/src/libnr/nr-convert2geom.h b/src/libnr/nr-convert2geom.h
index c8a139aa2b1dfe0097de08bd650f292e594b104c..b7cbd7ee803f907b2787d774432f6d27af5e4166 100644 (file)
--- a/src/libnr/nr-convert2geom.h
+++ b/src/libnr/nr-convert2geom.h
@@ -45,8 +45,8 @@ inline NR::Rect from_2geom(Geom::Rect const & rect2geom) {
     NR::Rect rect(rect2geom.min(), rect2geom.max());
     return rect;
 }
-inline boost::optional<Geom::Rect> to_2geom(boost::optional<NR::Rect> const & rect) {
-    boost::optional<Geom::Rect> rect2geom;
+inline Geom::OptRect to_2geom(boost::optional<NR::Rect> const & rect) {
+    Geom::OptRect rect2geom;
     if (!rect) {
         return rect2geom;
     }
@@ -61,12 +61,6 @@ inline Geom::Scale to_2geom(NR::scale const & in) {
     return Geom::Scale(in[NR::X], in[NR::Y]);
 }
 
-inline void to_2geom(std::vector<NR::Point> const &in_NR, std::vector<Geom::Point> &out_2geom) {
-    for (std::vector<NR::Point>::const_iterator it = in_NR.begin(); it != in_NR.end(); it++) {
-        out_2geom.push_back(to_2geom(*it));
-    }    
-}
-
 #endif
 
 /*