X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Frect.h;h=1feb8ad4fed460d19a9f83439e21bdd0abcc1ea0;hb=8c7a308c03e4b4196b4e2379a26d432b100ae2b1;hp=df18698419135176c6426b010e1c254d5146ee42;hpb=b655bd3359e9a014da68cd9f61e2a5b1d233247d;p=dcpomatic.git

diff --git a/src/lib/rect.h b/src/lib/rect.h
index df1869841..1feb8ad4f 100644
--- a/src/lib/rect.h
+++ b/src/lib/rect.h
@@ -17,8 +17,8 @@
 
 */
 
-#ifndef DVDOMATIC_RECT_H
-#define DVDOMATIC_RECT_H
+#ifndef DCPOMATIC_RECT_H
+#define DCPOMATIC_RECT_H
 
 #include "position.h"
 
@@ -42,6 +42,13 @@ public:
 		, height (0)
 	{}
 
+	Rect (Position<T> p, T w_, T h_)
+		: x (p.x)
+		, y (p.y)
+		, width (w_)
+		, height (h_)
+	{}
+
 	Rect (T x_, T y_, T w_, T h_)
 		: x (x_)
 		, y (y_)
@@ -54,11 +61,13 @@ public:
 	T width;
 	T height;
 
-	Position<T> position () const {
+	Position<T> position () const
+	{
 		return Position<T> (x, y);
 	}
 
-	Rect<T> intersection (Rect<T> const & other) const {
+	Rect<T> intersection (Rect<T> const & other) const
+	{
 		T const tx = max (x, other.x);
 		T const ty = max (y, other.y);
 	
@@ -69,7 +78,16 @@ public:
 			);
 	}
 
-	bool contains (Position<T> p) const {
+	void extend (Rect<T> const & other)
+	{
+		x = std::min (x, other.x);
+		y = std::min (y, other.y);
+		width = std::max (x + width, other.x + other.width) - x;
+		height = std::max (y + height, other.y + other.height) - y;
+	}
+
+	bool contains (Position<T> p) const
+	{
 		return (p.x >= x && p.x <= (x + width) && p.y >= y && p.y <= (y + height));
 	}
 };