projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add new "territory type" so that INT-T{D,L} can be chosen (#2704).
[dcpomatic.git]
/
src
/
lib
/
font.cc
diff --git
a/src/lib/font.cc
b/src/lib/font.cc
index aa9a8aaef7bc39d556f9377351a83cc0a2fbd401..955a2ad1ca2821b94ad43df82829d12ba2449b5d 100644
(file)
--- a/
src/lib/font.cc
+++ b/
src/lib/font.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2014-20
15
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2014-20
21
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,33
+18,56
@@
*/
*/
-#include "font.h"
+
#include "dcpomatic_assert.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>
#include <libxml++/libxml++.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
+
using std::string;
using std::string;
+using boost::optional;
using namespace dcpomatic;
using namespace dcpomatic;
+
Font::Font (cxml::NodePtr node)
Font::Font (cxml::NodePtr node)
- : _id (node->string_child
("Id"))
+ : _id (node->string_child("Id"))
{
for (auto i: node->node_children("File")) {
{
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") {
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)
{
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());
+ node->add_child("Id")->add_child_text(_id);
+ if (_
content.
file) {
+ node->add_child("File")->add_child_text(_
content.
file->string());
}
}
}
}
@@
-56,11
+79,33
@@
dcpomatic::operator== (Font const & a, Font const & b)
return false;
}
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();
}
return a.file() == b.file();
}
+
bool
dcpomatic::operator!= (Font const & a, Font const & b)
{
return !(a == b);
}
bool
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 {};
+}
+