revert NRRect/NRRectL conversion constructors for NR::Rect, since they

cannot correctly deal with "nullary" NRRect -- the correct path is to
convert NRRect to Maybe<Rect>

diff --git a/src/libnr/nr-rect.cpp b/src/libnr/nr-rect.cpp
index d34c548adae2f970f8c3331d43a8880157de0351..dbb54b9fdd3d52d51e36529032418579da39a020 100644 (file)
--- a/src/libnr/nr-rect.cpp
+++ b/src/libnr/nr-rect.cpp
@@ -247,16 +247,6 @@ Rect::Rect(const Point &p0, const Point &p1)
   _max(std::max(p0[X], p1[X]), std::max(p0[Y], p1[Y]))
 {}
 
-Rect::Rect(NRRect *r)
-    : _min(r->x0, r->y0),
-      _max(r->x1, r->y1)
-{}
-
-Rect::Rect(NRRectL *r)
-    : _min(r->x0, r->y0),
-      _max(r->x1, r->y1)
-{}
-
 /** returns the four corners of the rectangle in the correct winding order */
 Point Rect::corner(unsigned i) const {
        switch (i % 4) {

diff --git a/src/libnr/nr-rect.h b/src/libnr/nr-rect.h
index 2439df95d3361dde016a240eb35f3e518fd0386e..04f446487cccbb3928ded725fc143ecf8cbc2a70 100644 (file)
--- a/src/libnr/nr-rect.h
+++ b/src/libnr/nr-rect.h
@@ -25,9 +25,6 @@
 #include <libnr/nr-maybe.h>
 #include <libnr/nr-point-matrix-ops.h>
 
-struct NRRect;
-struct NRRectL;
-
 namespace NR {
     struct Matrix;
 
@@ -42,8 +39,6 @@ class Rect {
 public:
     Rect() : _min(-_inf(), -_inf()), _max(_inf(), _inf()) {}
     Rect(Point const &p0, Point const &p1);
-    Rect(NRRect *r);
-    Rect(NRRectL *r);
 
     Point const &min() const { return _min; }
     Point const &max() const { return _max; }