diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-06-14 14:09:52 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-06-14 14:09:52 +0100 |
| commit | 07e94266c1225d99c462bc43a7f2704dcaf0413c (patch) | |
| tree | bd058f3fd67f53a79775514cc0f9c6253aea9c18 /src/font_node.cc | |
| parent | b86d99bcf4f588b4f07f94bd14f44d559072f384 (diff) | |
| parent | 8837fe70049bd5ed7ab583c06d6c9a620a01b351 (diff) | |
Merge branch '1.0' of git.carlh.net:git/libdcp into 1.0
Diffstat (limited to 'src/font_node.cc')
| -rw-r--r-- | src/font_node.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/font_node.cc b/src/font_node.cc index 77d58aaf..6dd6e58f 100644 --- a/src/font_node.cc +++ b/src/font_node.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net> + Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net> This file is part of libdcp. @@ -45,7 +45,7 @@ using boost::shared_ptr; using boost::optional; using namespace dcp; -FontNode::FontNode (cxml::ConstNodePtr node, int tcr, string font_id_attribute) +FontNode::FontNode (cxml::ConstNodePtr node, optional<int> tcr, string font_id_attribute) { text = node->content (); |