summaryrefslogtreecommitdiff
path: root/src/lib/dcp_subtitle_content.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2022-07-09 20:22:38 +0200
committerCarl Hetherington <cth@carlh.net>2022-07-11 12:22:11 +0200
commit8b9888ed8247109dc3c09492302e865fa4731460 (patch)
tree1ff1c09074decfc44a1bff77d050f908d6542dda /src/lib/dcp_subtitle_content.cc
parent5a5f6d3ac42668017141469fd0e5cd14e3bebe88 (diff)
Fix font handling for DCP subtitles.
Diffstat (limited to 'src/lib/dcp_subtitle_content.cc')
-rw-r--r--src/lib/dcp_subtitle_content.cc10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/lib/dcp_subtitle_content.cc b/src/lib/dcp_subtitle_content.cc
index 3bae6e88f..a6cfd8d93 100644
--- a/src/lib/dcp_subtitle_content.cc
+++ b/src/lib/dcp_subtitle_content.cc
@@ -74,8 +74,14 @@ DCPSubtitleContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job)
sc->fix_empty_font_ids ();
- for (auto i: sc->load_font_nodes()) {
- only_text()->add_font(make_shared<Font>(i->id));
+ auto font_data = sc->font_data();
+ for (auto node: sc->load_font_nodes()) {
+ auto data = font_data.find(node->id);
+ if (data != font_data.end()) {
+ only_text()->add_font(make_shared<Font>(node->id, data->second));
+ } else {
+ only_text()->add_font(make_shared<Font>(node->id));
+ }
}
}