X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffont.cc;h=375427d93f71d57897da277f392b668dfce4f6d9;hb=5a820bb8fae34591be5ac6d19a73461b9dab532a;hp=e9df66cf71e339e49a31bbc5c78e9b5c9cc9664a;hpb=9bf2cf3509380663e6943f6b0d22dbec6002c332;p=dcpomatic.git

diff --git a/src/lib/font.cc b/src/lib/font.cc
index e9df66cf7..375427d93 100644
--- a/src/lib/font.cc
+++ b/src/lib/font.cc
@@ -1,84 +1,88 @@
 /*
-    Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
-#include "font.h"
+
 #include "dcpomatic_assert.h"
+#include "font.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
-#include <boost/foreach.hpp>
+LIBDCP_ENABLE_WARNINGS
+
 
 using std::string;
+using boost::optional;
+using namespace dcpomatic;
 
-static char const * names[] = {
-	"Normal",
-	"Italic",
-	"Bold"
-};
 
 Font::Font (cxml::NodePtr node)
-	: _id (node->string_child ("Id"))
+	: _id (node->string_child("Id"))
 {
-	DCPOMATIC_ASSERT (FontFiles::VARIANTS == 3);
-
-	BOOST_FOREACH (cxml::NodePtr i, node->node_children ("File")) {
-		string variant = i->optional_string_attribute("Variant").get_value_or ("Normal");
-		for (int j = 0; j < FontFiles::VARIANTS; ++j) {
-			if (variant == names[j]) {
-				_files.set (static_cast<FontFiles::Variant>(j), i->content());
-			}
+	for (auto i: node->node_children("File")) {
+		string variant = i->optional_string_attribute("Variant").get_value_or("Normal");
+		if (variant == "Normal") {
+			_file = i->content();
 		}
 	}
 }
 
+
 void
 Font::as_xml (xmlpp::Node* node)
 {
-	DCPOMATIC_ASSERT (FontFiles::VARIANTS == 3);
-
-	node->add_child("Id")->add_child_text (_id);
-	for (int i = 0; i < FontFiles::VARIANTS; ++i) {
-		if (_files.get(static_cast<FontFiles::Variant>(i))) {
-			xmlpp::Element* e = node->add_child ("File");
-			e->set_attribute ("Variant", names[i]);
-			e->add_child_text (_files.get(static_cast<FontFiles::Variant>(i)).get().string ());
-		}
+	node->add_child("Id")->add_child_text(_id);
+	if (_file) {
+		node->add_child("File")->add_child_text(_file->string());
 	}
 }
 
 
 bool
-operator== (Font const & a, Font const & b)
+dcpomatic::operator== (Font const & a, Font const & b)
 {
 	if (a.id() != b.id()) {
 		return false;
 	}
 
-	for (int i = 0; i < FontFiles::VARIANTS; ++i) {
-		if (a.file(static_cast<FontFiles::Variant>(i)) != b.file(static_cast<FontFiles::Variant>(i))) {
-			return false;
-		}
-	}
-
-	return true;
+	return a.file() == b.file();
 }
 
+
 bool
-operator!= (Font const & a, Font const & b)
+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 {};
+}
+