diff options
| author | MenTaLguY <mental@rydia.net> | 2007-03-09 01:32:29 +0000 |
|---|---|---|
| committer | mental <mental@users.sourceforge.net> | 2007-03-09 01:32:29 +0000 |
| commit | a8654c0e3fcb70955434828cf0586cf47d5731c9 (patch) | |
| tree | ec7f3a40c14da701e7501111eabc73ea0b3a0560 /src | |
| parent | address type-punned pointer warning (diff) | |
| download | inkscape-a8654c0e3fcb70955434828cf0586cf47d5731c9.tar.gz inkscape-a8654c0e3fcb70955434828cf0586cf47d5731c9.zip | |
Whoops, forgot to friend the methods I moved out of Rect
(bzr r2584)
Diffstat (limited to 'src')
| -rw-r--r-- | src/libnr/nr-rect.cpp | 4 | ||||
| -rw-r--r-- | src/libnr/nr-rect.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/libnr/nr-rect.cpp b/src/libnr/nr-rect.cpp index 9047e4e1c..3ffe06dc8 100644 --- a/src/libnr/nr-rect.cpp +++ b/src/libnr/nr-rect.cpp @@ -290,8 +290,8 @@ Maybe<Rect> intersection(Maybe<Rect const &> a, Maybe<Rect const &> b) { } else { Rect r; for ( int i=0 ; i < 2 ; i++ ) { - r._min[i] = MAX(a->_min[i], b->_min[i]); - r._max[i] = MIN(a->_max[i], b->_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(); } diff --git a/src/libnr/nr-rect.h b/src/libnr/nr-rect.h index 5e2332bf2..4ae5642ae 100644 --- a/src/libnr/nr-rect.h +++ b/src/libnr/nr-rect.h @@ -176,6 +176,8 @@ private: Point _min, _max; friend class MaybeStorage<Rect>; + friend Maybe<Rect> intersection(Maybe<Rect const &>, Maybe<Rect const &>); + friend Rect union_bounds(Rect const &, Rect const &); }; template <> |