From: mental <mental@users.sourceforge.net>
Date: Fri, 9 Mar 2007 01:32:29 +0000 (+0000)
Subject: Whoops, forgot to friend the methods I moved out of Rect
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=0ad5be4b16a3a627388ca5c7cc5906c42f73c069;p=inkscape.git

Whoops, forgot to friend the methods I moved out of Rect
---

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 <>