diff options
| author | Ted Gould <ted@gould.cx> | 2008-10-11 15:16:23 +0000 |
|---|---|---|
| committer | Ted Gould <ted@canonical.com> | 2008-10-11 15:16:23 +0000 |
| commit | 2f5eb047d9e05be5e68549ef6b75070d2faa7d2f (patch) | |
| tree | ca2e94164b6d7aaebfc17196ca46bfc825a7665a /src/libnr/nr-rect.h | |
| parent | Merge from trunk. (diff) | |
| download | inkscape-2f5eb047d9e05be5e68549ef6b75070d2faa7d2f.tar.gz inkscape-2f5eb047d9e05be5e68549ef6b75070d2faa7d2f.zip | |
Merging from trunk
(bzr r6884)
Diffstat (limited to 'src/libnr/nr-rect.h')
| -rw-r--r-- | src/libnr/nr-rect.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/libnr/nr-rect.h b/src/libnr/nr-rect.h index 7d130fd18..83f780efd 100644 --- a/src/libnr/nr-rect.h +++ b/src/libnr/nr-rect.h @@ -25,6 +25,7 @@ #include <boost/optional.hpp> #include <libnr/nr-point-matrix-ops.h> #include <libnr/nr-forward.h> +#include <2geom/rect.h> namespace NR { @@ -243,6 +244,9 @@ struct NRRect { explicit NRRect(boost::optional<NR::Rect> const &rect); operator boost::optional<NR::Rect>() const { return upgrade(); } boost::optional<NR::Rect> upgrade() const; + explicit NRRect(boost::optional<Geom::Rect> const &rect); + operator boost::optional<Geom::Rect>() const { return upgrade_2geom(); } + boost::optional<Geom::Rect> upgrade_2geom() const; NR::Coord x0, y0, x1, y1; }; |