diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-01-29 20:02:56 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-01-29 20:02:56 +0000 |
| commit | bfe277e664a03ec47cd6bee7e1b1e4aca6eb38e6 (patch) | |
| tree | 6bdc6fa07f2cde0565c4025ab552f2c0fc9c3b2f /src/lib/font.cc | |
| parent | 6a0da4eb43fc684c0f54a7a3a817a31dc8db7109 (diff) | |
| parent | 27867be66579551018c926ed3339624e463c1b08 (diff) | |
Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0
Diffstat (limited to 'src/lib/font.cc')
| -rw-r--r-- | src/lib/font.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/font.cc b/src/lib/font.cc index ecf7aabf0..5cf30a2aa 100644 --- a/src/lib/font.cc +++ b/src/lib/font.cc @@ -21,9 +21,10 @@ #include <libxml++/libxml++.h> Font::Font (cxml::NodePtr node) + : id (node->string_child ("Id")) + , file (node->optional_string_child ("File")) { - id = node->string_child ("Id"); - file = node->optional_string_child ("File"); + } void |