diff options
| author | MenTaLguY <mental@rydia.net> | 2007-03-04 19:06:52 +0000 |
|---|---|---|
| committer | mental <mental@users.sourceforge.net> | 2007-03-04 19:06:52 +0000 |
| commit | a5e05b67ac2f4829f59e35279ebb2d0097fff8ea (patch) | |
| tree | 77f6195ba4cb0d4ceb75dddd3761bce5cc266cdb /src/libnr/nr-rect.cpp | |
| parent | return plain rect if both union arguments are also plain rects (diff) | |
| download | inkscape-a5e05b67ac2f4829f59e35279ebb2d0097fff8ea.tar.gz inkscape-a5e05b67ac2f4829f59e35279ebb2d0097fff8ea.zip | |
remove remaining use of assume in nr-rect.cpp
(bzr r2541)
Diffstat (limited to 'src/libnr/nr-rect.cpp')
| -rw-r--r-- | src/libnr/nr-rect.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/libnr/nr-rect.cpp b/src/libnr/nr-rect.cpp index c3d23a619..c681783c7 100644 --- a/src/libnr/nr-rect.cpp +++ b/src/libnr/nr-rect.cpp @@ -261,15 +261,13 @@ void Rect::expandTo(Point p) { /** Returns the set of points shared by both rectangles. */ Maybe<Rect> Rect::intersection(Maybe<Rect> const &a, Maybe<Rect> const &b) { - if ( a == Nothing() || b == Nothing() ) { + if ( !a || !b ) { return Nothing(); } else { - Rect const &ra=a.assume(); - Rect const &rb=b.assume(); Rect r; for ( int i=0 ; i < 2 ; i++ ) { - r._min[i] = MAX(ra._min[i], rb._min[i]); - r._max[i] = MIN(ra._max[i], rb._max[i]); + r._min[i] = MAX(a->_min[i], b->_min[i]); + r._max[i] = MIN(a->_max[i], b->_max[i]); if ( r._min[i] > r._max[i] ) { return Nothing(); } |