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/text_node.h | |
| parent | b86d99bcf4f588b4f07f94bd14f44d559072f384 (diff) | |
| parent | 8837fe70049bd5ed7ab583c06d6c9a620a01b351 (diff) | |
Merge branch '1.0' of git.carlh.net:git/libdcp into 1.0
Diffstat (limited to 'src/text_node.h')
| -rw-r--r-- | src/text_node.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/text_node.h b/src/text_node.h index 8624a178..313bdbcb 100644 --- a/src/text_node.h +++ b/src/text_node.h @@ -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. @@ -63,7 +63,7 @@ public: , direction (DIRECTION_LTR) {} - TextNode (boost::shared_ptr<const cxml::Node> node, int tcr, std::string font_id_attribute); + TextNode (boost::shared_ptr<const cxml::Node> node, boost::optional<int> tcr, std::string font_id_attribute); float h_position; HAlign h_align; |