projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Another macOS std::list boost::thread SNAFU.
[dcpomatic.git]
/
src
/
lib
/
font.h
diff --git
a/src/lib/font.h
b/src/lib/font.h
index ca7650cc1b68d43406e2c8f27dd27e68762ea760..5876bf8a46052cbbbd75ad2adb941a581b2c7029 100644
(file)
--- a/
src/lib/font.h
+++ b/
src/lib/font.h
@@
-1,19
+1,20
@@
/*
Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2014-2015 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.
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
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/>.
*/
*/
@@
-26,13
+27,15
@@
#include <boost/filesystem.hpp>
#include <string>
#include <boost/filesystem.hpp>
#include <string>
+namespace dcpomatic {
+
class Font
{
public:
class Font
{
public:
- Font (std::string id)
+
explicit
Font (std::string id)
: _id (id) {}
: _id (id) {}
- Font (cxml::NodePtr node);
+
explicit
Font (cxml::NodePtr node);
void as_xml (xmlpp::Node* node);
void as_xml (xmlpp::Node* node);
@@
-57,7
+60,9
@@
private:
boost::optional<boost::filesystem::path> _file;
};
boost::optional<boost::filesystem::path> _file;
};
-bool
-operator!= (Font const & a, Font const & b);
+bool operator!= (Font const & a, Font const & b);
+bool operator== (Font const & a, Font const & b);
+
+}
#endif
#endif