summaryrefslogtreecommitdiff
path: root/src/lib
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 /src/lib
parent41cd4321fc3b068f16cdf12413f602ed4a157deb (diff)
Fix crazy thinko in Rect::extend() causing subtitles to disappear when they were merged.
From 565490c in master.
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/rect.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/rect.h b/src/lib/rect.h
index d0daec437..4851ad007 100644
--- 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 {