diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-06-03 11:11:32 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-06-03 11:11:32 +0100 |
| commit | e110d927e8dfec709a548172173b3ed1236c2d82 (patch) | |
| tree | 0f51ae311c471b77defb583fed6500ec0f13dc4d /src/lib/types.cc | |
| parent | 47cc374e135a2c7f3f1702cd53bb162ecf2b986d (diff) | |
A few build fixes.
Diffstat (limited to 'src/lib/types.cc')
| -rw-r--r-- | src/lib/types.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/types.cc b/src/lib/types.cc index c077bad3e..78cb4cd64 100644 --- a/src/lib/types.cc +++ b/src/lib/types.cc @@ -36,8 +36,8 @@ bool operator!= (Crop const & a, Crop const & b) /** @param other A Rect. * @return The intersection of this with `other'. */ -Rect -Rect::intersection (Rect const & other) const +dcpomatic::Rect +dcpomatic::Rect::intersection (Rect const & other) const { int const tx = max (x, other.x); int const ty = max (y, other.y); @@ -50,7 +50,7 @@ Rect::intersection (Rect const & other) const } bool -Rect::contains (Position p) const +dcpomatic::Rect::contains (Position p) const { return (p.x >= x && p.x <= (x + width) && p.y >= y && p.y <= (y + height)); } |