summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: bb610d0)
raw | patch | inline | side by side (parent: bb610d0)
author | buliabyak <buliabyak@users.sourceforge.net> | |
Fri, 9 Mar 2007 05:35:40 +0000 (05:35 +0000) | ||
committer | buliabyak <buliabyak@users.sourceforge.net> | |
Fri, 9 Mar 2007 05:35:40 +0000 (05:35 +0000) |
src/libnr/nr-rect.cpp | patch | blob | history | |
src/libnr/nr-rect.h | patch | blob | history |
diff --git a/src/libnr/nr-rect.cpp b/src/libnr/nr-rect.cpp
index fd291218b781b425152bdba39f6599b11ab1104a..2d4629d42e1c42044795982b64ead958e633d5ce 100644 (file)
--- a/src/libnr/nr-rect.cpp
+++ b/src/libnr/nr-rect.cpp
}
/** Returns the set of points shared by both rectangles. */
-Maybe<Rect> intersection(Maybe<Rect const &> a, Maybe<Rect const &> b) {
+Maybe<Rect> intersection(Maybe<Rect> const & a, Maybe<Rect> const & b) {
if ( !a || !b ) {
return Nothing();
} else {
diff --git a/src/libnr/nr-rect.h b/src/libnr/nr-rect.h
index 4ae5642ae795015a614ba9ca1346f11386439d66..b632261aa235ef0500df2ba4d51cf8a42f5b2fcc 100644 (file)
--- a/src/libnr/nr-rect.h
+++ b/src/libnr/nr-rect.h
Point _min, _max;
friend class MaybeStorage<Rect>;
- friend Maybe<Rect> intersection(Maybe<Rect const &>, Maybe<Rect const &>);
+ friend Maybe<Rect> intersection(Maybe<Rect> const &, Maybe<Rect> const &);
friend Rect union_bounds(Rect const &, Rect const &);
};
};
/** Returns the set of points shared by both rectangles. */
-Maybe<Rect> intersection(Maybe<Rect const &> a, Maybe<Rect const &> b);
+Maybe<Rect> intersection(Maybe<Rect> const & a, Maybe<Rect> const & b);
/** Returns the smallest rectangle that encloses both rectangles. */
Rect union_bounds(Rect const &a, Rect const &b);
-inline Rect union_bounds(Maybe<Rect const &> a, Rect const &b) {
+inline Rect union_bounds(Maybe<Rect> const & a, Rect const &b) {
if (a) {
return union_bounds(*a, b);
} else {
return b;
}
}
-inline Rect union_bounds(Rect const &a, Maybe<Rect const &> b) {
+inline Rect union_bounds(Rect const &a, Maybe<Rect> const & b) {
if (b) {
return union_bounds(a, *b);
} else {
return a;
}
}
-inline Maybe<Rect> union_bounds(Maybe<Rect const &> a, Maybe<Rect const &> b)
+inline Maybe<Rect> union_bounds(Maybe<Rect> const & a, Maybe<Rect> const & b)
{
if (!a) {
return b;