diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-12-21 03:05:06 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-12-21 03:05:06 +0000 |
| commit | 456967a554cc29fda50ef0c6267a3b823592f366 (patch) | |
| tree | a130d40bffb1afc1a4528b31ee94431c661323c5 | |
| parent | 9ff6697a545bd98ea8820a45e3f6bb5b55495634 (diff) | |
| parent | 7106334071bc2a44b2cb4f27a19052ce78806b77 (diff) | |
Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
| -rw-r--r-- | src/lib/subrip_decoder.cc | 2 | ||||
| -rw-r--r-- | src/lib/writer.cc | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/lib/subrip_decoder.cc b/src/lib/subrip_decoder.cc index 7ec8a1d39..77c3f16a5 100644 --- a/src/lib/subrip_decoder.cc +++ b/src/lib/subrip_decoder.cc @@ -63,7 +63,7 @@ SubRipDecoder::pass () SubRipContent::font_id, j->italic, dcp::Color (255, 255, 255), - j->font_size, + j->font_size.points (72 * 11), dcp::Time (rint (_subtitles[_next].from.metric().get().all_as_milliseconds() / 4)), dcp::Time (rint (_subtitles[_next].to.metric().get().all_as_milliseconds() / 4)), i->vertical_position.line.get() * (1.5 / 22) + 0.8, diff --git a/src/lib/writer.cc b/src/lib/writer.cc index 512973f46..f844a139a 100644 --- a/src/lib/writer.cc +++ b/src/lib/writer.cc @@ -628,6 +628,10 @@ Writer::write (PlayerSubtitles subs) void Writer::write (list<shared_ptr<Font> > fonts) { + if (fonts.empty ()) { + return; + } + if (!_subtitle_content) { _subtitle_content.reset (new dcp::InteropSubtitleContent (_film->name(), _film->subtitle_language ())); } |