summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/dcp_subtitle_content.cc4
-rw-r--r--src/lib/text_decoder.cc2
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()));