X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Frect.h;h=97b90abc5e28546ab74d6c0fa1115460289a0dbb;hb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;hp=1feb8ad4fed460d19a9f83439e21bdd0abcc1ea0;hpb=4e411ea97b4dab8a5fa282d1d4cf7971ef1e24ad;p=dcpomatic.git diff --git a/src/lib/rect.h b/src/lib/rect.h index 1feb8ad4f..97b90abc5 100644 --- a/src/lib/rect.h +++ b/src/lib/rect.h @@ -21,20 +21,21 @@ #define DCPOMATIC_RECT_H #include "position.h" +#include /* Put this inside a namespace as Apple put a Rect in the global namespace */ namespace dcpomatic { - + /** @struct Rect * @brief A rectangle. */ -template +template class Rect { public: - + Rect () : x (0) , y (0) @@ -70,7 +71,7 @@ public: { T const tx = max (x, other.x); T const ty = max (y, other.y); - + return Rect ( tx, ty, min (x + width, other.x + other.width) - tx,