swaroop: support creation of H264 with 24-bit PCM.

[dcpomatic.git] / src / lib / rect.h

diff --git a/src/lib/rect.h b/src/lib/rect.h
index d0daec43712ab4c5cd7a0bf88cf27c3c5fc69a74..4851ad007fe11c6ce7b7469c2cb6f7367dd2eccd 100644 (file)
--- a/src/lib/rect.h
+++ b/src/lib/rect.h
@@ -91,10 +91,12 @@ public:
 
        void extend (Rect<T> const & other)
        {
+               T old_x = x;
+               T old_y = y;
                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;
+               width = std::max (old_x + width, other.x + other.width) - x;
+               height = std::max (old_y + height, other.y + other.height) - y;
        }
 
        Rect<T> extended (T amount) const {