Merge branch '1.0' of /home/carl/git/dvdomatic into 1.0

1 files changed, 0 insertions, 22 deletions

diff --git a/src/lib/types.cc b/src/lib/types.cc
index 78cb4cd64..035c8363d 100644
--- a/src/lib/types.cc
+++ b/src/lib/types.cc
@@ -32,25 +32,3 @@ bool operator!= (Crop const & a, Crop const & b)
 	return !(a == b);
 }
 
-
-/** @param other A Rect.
- *  @return The intersection of this with `other'.
- */
-dcpomatic::Rect
-dcpomatic::Rect::intersection (Rect const & other) const
-{
-	int const tx = max (x, other.x);
-	int const ty = max (y, other.y);
-	
-	return Rect (
-		tx, ty,
-		min (x + width, other.x + other.width) - tx,
-		min (y + height, other.y + other.height) - ty
-		);
-}
-
-bool
-dcpomatic::Rect::contains (Position p) const
-{
-	return (p.x >= x && p.x <= (x + width) && p.y >= y && p.y <= (y + height));
-}