diff options
| author | Carl Hetherington <cth@carlh.net> | 2022-09-20 12:22:02 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2022-09-20 21:24:16 +0200 |
| commit | ff639b3cf30afcc097bfd21d39c8d15f466cadd6 (patch) | |
| tree | 4f45b9c9007bd9fd36f39ed11f045e6fbfbef786 /src/lib | |
| parent | dc5e11944a30a9d381dc0e67cf657c5f2cb65845 (diff) | |
Fix font_id_map errors when importing DCP subtitles that have no
font declarations / tags (#2339).
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/dcp_subtitle_content.cc | 4 | ||||
| -rw-r--r-- | src/lib/text_decoder.cc | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/lib/dcp_subtitle_content.cc b/src/lib/dcp_subtitle_content.cc index a6cfd8d93..b111bdb2a 100644 --- a/src/lib/dcp_subtitle_content.cc +++ b/src/lib/dcp_subtitle_content.cc @@ -83,6 +83,10 @@ DCPSubtitleContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job) only_text()->add_font(make_shared<Font>(node->id)); } } + + if (only_text()->fonts().empty()) { + only_text()->add_font(make_shared<Font>("")); + } } DCPTime diff --git a/src/lib/text_decoder.cc b/src/lib/text_decoder.cc index c691f795d..fa5ed6c7a 100644 --- a/src/lib/text_decoder.cc +++ b/src/lib/text_decoder.cc @@ -110,7 +110,7 @@ TextDecoder::emit_plain_start (ContentTime from, vector<dcp::SubtitleString> sub auto string_text = StringText( subtitle, content()->outline_width(), - subtitle.font() ? content()->get_font(*subtitle.font()) : shared_ptr<Font>(), + content()->get_font(subtitle.font().get_value_or("")), valign_standard ); string_text.set_text(escape_text(string_text.text())); |