summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-04-27 11:46:24 +0100
committerCarl Hetherington <cth@carlh.net>2018-09-04 23:31:49 +0100
commit8ef185edbbf07435603009bc9b5bc56924cf02ca (patch)
tree61a6323bcd451ceb82c72a60952cda085cd332b6 /test
parent41cd4321fc3b068f16cdf12413f602ed4a157deb (diff)
Fix crazy thinko in Rect::extend() causing subtitles to disappear when they were merged.
From 565490c in master.
Diffstat (limited to 'test')
m---------test/data0
-rw-r--r--test/rect_test.cc12
2 files changed, 11 insertions, 1 deletions
diff --git a/test/data b/test/data
-Subproject e5472ceee4b68737cdf10157c6a5d2018c98e66
+Subproject 87b0b0e75c9af32e011ac7626f18fc42018d580
diff --git a/test/rect_test.cc b/test/rect_test.cc
index 1e3730148..832fdad82 100644
--- 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);
+}