diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-12-15 22:59:36 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-12-15 22:59:36 +0100 |
| commit | d8d4225a3e488cf78438b80938aa18fd07d30a06 (patch) | |
| tree | 2c2c87ed5791dfabbf7c679fc27f9bd6d33c4281 /src | |
| parent | 2f57af66707bd1854083d0d84f49a221cdf451a2 (diff) | |
Stop empty Font IDs in imported DCP subtitles making it into the
output DCP (#1689).
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/dcp_subtitle_content.cc | 2 | ||||
| -rw-r--r-- | src/lib/dcp_subtitle_decoder.cc | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/lib/dcp_subtitle_content.cc b/src/lib/dcp_subtitle_content.cc index 81e26cf7c..f8d12d4e4 100644 --- a/src/lib/dcp_subtitle_content.cc +++ b/src/lib/dcp_subtitle_content.cc @@ -77,6 +77,8 @@ DCPSubtitleContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job) _length = ContentTime::from_seconds (sc->latest_subtitle_out().as_seconds ()); + sc->fix_empty_font_ids (); + BOOST_FOREACH (shared_ptr<dcp::LoadFontNode> i, sc->load_font_nodes ()) { only_text()->add_font (shared_ptr<Font> (new Font (i->id))); } diff --git a/src/lib/dcp_subtitle_decoder.cc b/src/lib/dcp_subtitle_decoder.cc index 096580a6c..f34c495c0 100644 --- a/src/lib/dcp_subtitle_decoder.cc +++ b/src/lib/dcp_subtitle_decoder.cc @@ -34,6 +34,7 @@ DCPSubtitleDecoder::DCPSubtitleDecoder (shared_ptr<const Film> film, shared_ptr< : Decoder (film) { shared_ptr<dcp::SubtitleAsset> c (load (content->path (0))); + c->fix_empty_font_ids (); _subtitles = c->subtitles (); _next = _subtitles.begin (); |