Fix font_id_map errors when importing DCP subtitles that have no

[dcpomatic.git] / src / lib / dcp_subtitle_content.cc

diff --git a/src/lib/dcp_subtitle_content.cc b/src/lib/dcp_subtitle_content.cc
index 858849ca3134f003803abbfcad881dcb890c1d8e..b111bdb2a242b9aee2ba7ecb4730a61418bd4368 100644 (file)
--- a/src/lib/dcp_subtitle_content.cc
+++ b/src/lib/dcp_subtitle_content.cc
@@ -48,7 +48,8 @@ DCPSubtitleContent::DCPSubtitleContent (cxml::ConstNodePtr node, int version)
        : Content (node)
        , _length (node->number_child<ContentTime::Type> ("Length"))
 {
-       text = TextContent::from_xml (this, node, version);
+       list<string> notes;
+       text = TextContent::from_xml (this, node, version, notes);
 }
 
 void
@@ -73,8 +74,18 @@ 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));
+               }
+       }
+
+       if (only_text()->fonts().empty()) {
+               only_text()->add_font(make_shared<Font>(""));
        }
 }