X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Ffont.cc;h=955a2ad1ca2821b94ad43df82829d12ba2449b5d;hb=24b83514fed0683008bff23c6fd9c1d990a30b02;hp=f750bfc88401b4a69939ea993aecf6ed35b97a0a;hpb=3c29aa6531a4046a8db72dcac81189eb8893233c;p=dcpomatic.git

diff --git a/src/lib/font.cc b/src/lib/font.cc
index f750bfc88..955a2ad1c 100644
--- a/src/lib/font.cc
+++ b/src/lib/font.cc
@@ -28,6 +28,7 @@ LIBDCP_ENABLE_WARNINGS
 
 
 using std::string;
+using boost::optional;
 using namespace dcpomatic;
 
 
@@ -37,18 +38,36 @@ Font::Font (cxml::NodePtr node)
 	for (auto i: node->node_children("File")) {
 		string variant = i->optional_string_attribute("Variant").get_value_or("Normal");
 		if (variant == "Normal") {
-			_file = i->content();
+			_content.file = i->content();
 		}
 	}
 }
 
 
+Font::Font(Font const& other)
+	: _id(other._id)
+	, _content(other._content)
+{
+
+}
+
+
+Font& Font::operator=(Font const& other)
+{
+	if (&other != this) {
+		_id = other._id;
+		_content = other._content;
+	}
+	return *this;
+}
+
+
 void
 Font::as_xml (xmlpp::Node* node)
 {
 	node->add_child("Id")->add_child_text(_id);
-	if (_file) {
-		node->add_child("File")->add_child_text(_file->string());
+	if (_content.file) {
+		node->add_child("File")->add_child_text(_content.file->string());
 	}
 }
 
@@ -60,6 +79,11 @@ dcpomatic::operator== (Font const & a, Font const & b)
 		return false;
 	}
 
+	/* XXX: it's dubious that this ignores _data, though I think it's OK for the cases
+	 * where operator== is used.  Perhaps we should remove operator== and have a more
+	 * specific comparator.
+	 */
+
 	return a.file() == b.file();
 }
 
@@ -69,3 +93,19 @@ dcpomatic::operator!= (Font const & a, Font const & b)
 {
 	return !(a == b);
 }
+
+
+optional<dcp::ArrayData>
+Font::data () const
+{
+	if (_content.data) {
+		return _content.data;
+	}
+
+	if (_content.file) {
+		return dcp::ArrayData(*_content.file);
+	}
+
+	return {};
+}
+