Fix font_id_map errors when importing DCP subtitles that have no

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

diff --git a/src/lib/font.cc b/src/lib/font.cc
index aa9a8aaef7bc39d556f9377351a83cc0a2fbd401..375427d93f71d57897da277f392b668dfce4f6d9 100644 (file)
--- a/src/lib/font.cc
+++ b/src/lib/font.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,31 +18,36 @@
 
 */
 
-#include "font.h"
+
 #include "dcpomatic_assert.h"
-#include "warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
+#include "font.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
+
 
 using std::string;
+using boost::optional;
 using namespace dcpomatic;
 
+
 Font::Font (cxml::NodePtr node)
-       : _id (node->string_child ("Id"))
+       : _id (node->string_child("Id"))
 {
        for (auto i: node->node_children("File")) {
-               string variant = i->optional_string_attribute("Variant").get_value_or ("Normal");
+               string variant = i->optional_string_attribute("Variant").get_value_or("Normal");
                if (variant == "Normal") {
                        _file = i->content();
                }
        }
 }
 
+
 void
 Font::as_xml (xmlpp::Node* node)
 {
-       node->add_child("Id")->add_child_text (_id);
+       node->add_child("Id")->add_child_text(_id);
        if (_file) {
                node->add_child("File")->add_child_text(_file->string());
        }
@@ -59,8 +64,25 @@ dcpomatic::operator== (Font const & a, Font const & b)
        return a.file() == b.file();
 }
 
+
 bool
 dcpomatic::operator!= (Font const & a, Font const & b)
 {
        return !(a == b);
 }
+
+
+optional<dcp::ArrayData>
+Font::data () const
+{
+       if (_data) {
+               return _data;
+       }
+
+       if (_file) {
+               return dcp::ArrayData(*_file);
+       }
+
+       return {};
+}
+