Add OpenSSL licence exception.

[libdcp.git] / src / text_node.cc

diff --git a/src/text_node.cc b/src/text_node.cc
index aa318ce75b4e4b6c6c425b45148258baa8b1ab0b..03777c75987b2bf1930d19038095f45ee4a45ce5 100644 (file)
--- a/src/text_node.cc
+++ b/src/text_node.cc
@@ -1,20 +1,34 @@
 /*
     Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp 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.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp 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
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of portions of this program with the
+    OpenSSL library under certain conditions as described in each
+    individual source file, and distribute linked combinations
+    including the two.
 
+    You must obey the GNU General Public License in all respects
+    for all of the code used other than OpenSSL.  If you modify
+    file(s) with this exception, you may extend this exception to your
+    version of the file(s), but you are not obligated to do so.  If you
+    do not wish to do so, delete this exception statement from your
+    version.  If you delete this exception statement from all source
+    files in the program, then also delete it here.
 */
 
 /** @file  src/text.cc
@@ -42,6 +56,7 @@ TextNode::TextNode (boost::shared_ptr<const cxml::Node> node, int tcr, string fo
        , h_align (HALIGN_CENTER)
        , v_position (0)
        , v_align (VALIGN_CENTER)
+       , direction (DIRECTION_LTR)
 {
        text = node->content ();
 
@@ -77,6 +92,11 @@ TextNode::TextNode (boost::shared_ptr<const cxml::Node> node, int tcr, string fo
                v_align = string_to_valign (va.get ());
        }
 
+       optional<string> d = node->optional_string_attribute ("Direction");
+       if (d) {
+               direction = string_to_direction (d.get ());
+       }
+
        list<cxml::NodePtr> f = node->node_children ("Font");
        BOOST_FOREACH (cxml::NodePtr& i, f) {
                font_nodes.push_back (shared_ptr<FontNode> (new FontNode (i, tcr, font_id_attribute)));