Fix crazy thinko in Rect::extend() causing subtitles to disappear when they were...

diff --git a/ChangeLog b/ChangeLog
index fd94caf579a917e03a265355dc6dfe17d2a73f17..0f9f0ab51467ac3bce03ffed8434f45878035c08 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2018-04-27  Carl Hetherington  <cth@carlh.net>
+
+       * Fix obscured subtitles in some cases.
+
 2018-04-25  Carl Hetherington  <cth@carlh.net>
 
        * Updated fr_FR translation from Thierry Journet.

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 {

diff --git a/test/rect_test.cc b/test/rect_test.cc
index 1e3730148fb8ca7d8311f9d2992965fbd20543ea..832fdad823fca2a9c446164a81a8b16f63930bb8 100644 (file)
--- a/test/rect_test.cc
+++ b/test/rect_test.cc
@@ -29,10 +29,20 @@
 
 using boost::optional;
 
-BOOST_AUTO_TEST_CASE (rect_test)
+BOOST_AUTO_TEST_CASE (rect_test1)
 {
        dcpomatic::Rect<int> a (0, 0, 100, 100);
        dcpomatic::Rect<int> b (200, 200, 100, 100);
        optional<dcpomatic::Rect<int> > c = a.intersection (b);
        BOOST_CHECK (!c);
 }
+
+BOOST_AUTO_TEST_CASE (rect_test2)
+{
+       dcpomatic::Rect<int> a (0, 330, 100, 85);
+       a.extend (dcpomatic::Rect<int> (50, 235, 100, 85));
+       BOOST_CHECK_EQUAL (a.x, 0);
+       BOOST_CHECK_EQUAL (a.y, 235);
+       BOOST_CHECK_EQUAL (a.width, 150);
+       BOOST_CHECK_EQUAL (a.height, 180);
+}