projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5e2596f
)
Fix thinko-ed logic causing all subtitles to be treated as though
author
Carl Hetherington
<cth@carlh.net>
Mon, 9 Nov 2020 00:11:20 +0000
(
01:11
+0100)
committer
Carl Hetherington
<cth@carlh.net>
Mon, 16 Nov 2020 00:40:36 +0000
(
01:40
+0100)
they have borders. This fix will cause some movement of border-less
subtitles (in existing projects) within the video frame.
src/lib/render_text.cc
patch
|
blob
|
history
diff --git
a/src/lib/render_text.cc
b/src/lib/render_text.cc
index f9c04dc4dc09b7678b65596a5a04b473b75f0869..b3ddad5bb26b75c73658f4da3f90925813adc73f 100644
(file)
--- a/
src/lib/render_text.cc
+++ b/
src/lib/render_text.cc
@@
-332,7
+332,7
@@
render_line (list<StringText> subtitles, list<shared_ptr<Font> > fonts, dcp::Siz
}
}
- float const border_width = dcp::BORDER ? (first.outline_width * target.width / 2048.0) : 0;
+ float const border_width =
first.effect() ==
dcp::BORDER ? (first.outline_width * target.width / 2048.0) : 0;
size.width += 2 * ceil (border_width);
size.height += 2 * ceil (border_width);