diff options
| author | Johan B. C. Engelen <jbc.engelen@swissonline.ch> | 2008-07-08 20:18:44 +0000 |
|---|---|---|
| committer | johanengelen <johanengelen@users.sourceforge.net> | 2008-07-08 20:18:44 +0000 |
| commit | 362bc9381011284b458dc7815ec77ca1d74e5935 (patch) | |
| tree | 88f49ea34b24f219541aa8a08760296bfda4c827 /src/display | |
| parent | 2geomify ellipse creation (diff) | |
| download | inkscape-362bc9381011284b458dc7815ec77ca1d74e5935.tar.gz inkscape-362bc9381011284b458dc7815ec77ca1d74e5935.zip | |
2geomify SPCurve::new_from_rect
(bzr r6235)
Diffstat (limited to 'src/display')
| -rw-r--r-- | src/display/curve.cpp | 9 | ||||
| -rw-r--r-- | src/display/curve.h | 3 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/display/curve.cpp b/src/display/curve.cpp index 68cb1c900..c229ec28a 100644 --- a/src/display/curve.cpp +++ b/src/display/curve.cpp @@ -34,6 +34,7 @@ #include <2geom/sbasis-geometric.h> #include <2geom/sbasis-to-bezier.h> #include "svg/svg.h" +#include <2geom/point.h> static unsigned sp_bpath_length(NArtBpath const bpath[]); static bool sp_bpath_closed(NArtBpath const bpath[]); @@ -143,17 +144,15 @@ SPCurve::new_from_bpath(NArtBpath *bpath) // * 2GEOMproof SPCurve * -SPCurve::new_from_rect(NR::Maybe<NR::Rect> const &rect) +SPCurve::new_from_rect(Geom::Rect const &rect) { - g_return_val_if_fail(rect, NULL); - SPCurve *c = new SPCurve(); - NR::Point p = rect->corner(0); + NR::Point p = rect.corner(0); c->moveto(p); for (int i=3; i>=0; i--) { - c->lineto(rect->corner(i)); + c->lineto(rect.corner(i)); } c->closepath_current(); diff --git a/src/display/curve.h b/src/display/curve.h index 39720e401..6697987ca 100644 --- a/src/display/curve.h +++ b/src/display/curve.h @@ -19,7 +19,6 @@ #include <glib/gslist.h> #include <2geom/forward.h> -#include <2geom/point.h> #include "libnr/nr-forward.h" #include "libnr/nr-rect.h" @@ -36,7 +35,7 @@ public: SPCurve(Geom::PathVector const& pathv); static SPCurve * new_from_bpath(NArtBpath *bpath); static SPCurve * new_from_foreign_bpath(NArtBpath const *bpath); - static SPCurve * new_from_rect(NR::Maybe<NR::Rect> const &rect); + static SPCurve * new_from_rect(Geom::Rect const &rect); virtual ~SPCurve(); |