X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Frect.h;h=a01e0f8858ffba6d31eb6b9675d0cff571b4571d;hb=f706bbb9afd10472e81a051cd5db601d6404377c;hp=4851ad007fe11c6ce7b7469c2cb6f7367dd2eccd;hpb=565490c24a46d0aa941f75cf2a03b195246008b4;p=dcpomatic.git diff --git a/src/lib/rect.h b/src/lib/rect.h index 4851ad007..a01e0f885 100644 --- a/src/lib/rect.h +++ b/src/lib/rect.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2013 Carl Hetherington + Copyright (C) 2013-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,18 +18,22 @@ */ + #ifndef DCPOMATIC_RECT_H #define DCPOMATIC_RECT_H + #include "position.h" #include #include + /* Put this inside a namespace as Apple put a Rect in the global namespace */ namespace dcpomatic { + /** @struct Rect * @brief A rectangle. */ @@ -69,7 +73,7 @@ public: return Position (x, y); } - boost::optional > intersection (Rect const & other) const + boost::optional> intersection (Rect const & other) const { /* This isn't exactly the paragon of mathematical precision */ @@ -83,7 +87,7 @@ public: ); if (r.width < 0 || r.height < 0) { - return boost::optional > (); + return {}; } return r; @@ -114,6 +118,15 @@ public: } }; + +template +bool operator== (Rect const& a, Rect const& b) +{ + return a.x == b.x && a.y == b.y && a.width == b.width && a.height == b.height; } + +} + + #endif