diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-12-15 23:35:03 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-12-15 23:35:03 +0100 |
| commit | 07f451e01f82793904482f55c5a89163c6bb8e44 (patch) | |
| tree | df5cb7af4747fef0caa010e688ad503349881599 /src | |
| parent | 0ae846f2cb9c43ef65331796e18c6d4706437060 (diff) | |
Stop empty Font IDs in imported DCP subtitles making it into the
output DCP (#1689).
Back-ported from d8d4225a3e488cf78438b80938aa18fd07d30a06 in v2.15.x
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 54bd631cb..63ee19830 100644 --- a/src/lib/dcp_subtitle_content.cc +++ b/src/lib/dcp_subtitle_content.cc @@ -76,6 +76,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 3a182c0c7..e76004c2c 100644 --- a/src/lib/dcp_subtitle_decoder.cc +++ b/src/lib/dcp_subtitle_decoder.cc @@ -33,6 +33,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 (); |