/*
- 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.
*/
-#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") {
+ _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)
{
- 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 (_content.file) {
+ node->add_child("File")->add_child_text(_content.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;
- }
- }
+ /* 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 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 (_content.data) {
+ return _content.data;
+ }
+
+ if (_content.file) {
+ return dcp::ArrayData(*_content.file);
+ }
+
+ return {};
+}
+