From d0ec2cc4f82877b76697e2fc7aa21b73d61c63d0 Mon Sep 17 00:00:00 2001 From: mental Date: Sun, 18 Mar 2007 23:18:32 +0000 Subject: [PATCH] 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 --- src/libnr/nr-rect.cpp | 10 ---------- src/libnr/nr-rect.h | 5 ----- 2 files changed, 15 deletions(-) diff --git a/src/libnr/nr-rect.cpp b/src/libnr/nr-rect.cpp index d34c548ad..dbb54b9fd 100644 --- 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 2439df95d..04f446487 100644 --- a/src/libnr/nr-rect.h +++ b/src/libnr/nr-rect.h @@ -25,9 +25,6 @@ #include #include -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; } -- 2.30.2