Fix code and tests so that SubtitleString::v_position is between 0 and 1 (not a percentage) as the comment says it should be.

3 files changed, 26 insertions, 26 deletions

diff --git a/src/text.cc b/src/text.cc
index a846d961..d18066dd 100644
--- a/src/text.cc
+++ b/src/text.cc
@@ -45,7 +45,7 @@ Text::Text (boost::shared_ptr<const cxml::Node> node, int tcr)
 	if (!x) {
 		x = node->number_attribute<float> ("Vposition");
 	}
-	v_position = x.get ();
+	v_position = x.get () / 100;
 	
 	optional<string> v = node->optional_string_attribute ("VAlign");
 	if (!v) {
diff --git a/test/subtitle_test.cc b/test/subtitle_test.cc
index a3694717..0cdf3312 100644
--- a/test/subtitle_test.cc
+++ b/test/subtitle_test.cc
@@ -41,7 +41,7 @@ BOOST_AUTO_TEST_CASE (subtitles1)
 				   39,
 				   dcp::Time (0, 0, 5, 198, 250),
 				   dcp::Time (0, 0, 7, 115, 250),
-				   15,
+				   0.15,
 				   dcp::BOTTOM,
 				   "My jacket was Idi Amin's",
 				   dcp::BORDER,
@@ -59,7 +59,7 @@ BOOST_AUTO_TEST_CASE (subtitles1)
 				   39,
 				   dcp::Time (0, 0, 7, 177, 250),
 				   dcp::Time (0, 0, 11, 31, 250),
-				   21,
+				   0.21,
 				   dcp::BOTTOM,
 				   "My corset was H.M. The Queen's",
 				   dcp::BORDER,
@@ -74,7 +74,7 @@ BOOST_AUTO_TEST_CASE (subtitles1)
 				   39,
 				   dcp::Time (0, 0, 7, 177, 250),
 				   dcp::Time (0, 0, 11, 31, 250),
-				   15,
+				   0.15,
 				   dcp::BOTTOM,
 				   "My large wonderbra",
 				   dcp::BORDER,
@@ -92,7 +92,7 @@ BOOST_AUTO_TEST_CASE (subtitles1)
 				   39,
 				   dcp::Time (0, 0, 11, 94, 250),
 				   dcp::Time (0, 0, 13, 63, 250),
-				   15,
+				   0.15,
 				   dcp::BOTTOM,
 				   "Once belonged to the Shah",
 				   dcp::BORDER,
@@ -110,7 +110,7 @@ BOOST_AUTO_TEST_CASE (subtitles1)
 				   39,
 				   dcp::Time (0, 0, 13, 104, 250),
 				   dcp::Time (0, 0, 15, 177, 250),
-				   15,
+				   0.15,
 				   dcp::BOTTOM,
 				   "And these are Roy Hattersley's jeans",
 				   dcp::BORDER,
@@ -134,7 +134,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   42,
 				   dcp::Time (0, 0, 41, 62, 250),
 				   dcp::Time (0, 0, 43, 52, 250),
-				   89,
+				   0.89,
 				   dcp::TOP,
 				   "At afternoon tea with John Peel",
 				   dcp::BORDER,
@@ -149,7 +149,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   42,
 				   dcp::Time (0, 0, 41, 62, 250),
 				   dcp::Time (0, 0, 43, 52, 250),
-				   95,
+				   0.95,
 				   dcp::TOP,
 				   "I enquired if his accent was real",
 				   dcp::BORDER,
@@ -167,7 +167,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   42,
 				   dcp::Time (0, 0, 50, 42, 250),
 				   dcp::Time (0, 0, 52, 21, 250),
-				   89,
+				   0.89,
 				   dcp::TOP,
 				   "He said \"out of the house",
 				   dcp::BORDER,
@@ -182,7 +182,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   42,
 				   dcp::Time (0, 0, 50, 42, 250),
 				   dcp::Time (0, 0, 52, 21, 250),
-				   95,
+				   0.95,
 				   dcp::TOP,
 				   "I'm incredibly scouse",
 				   dcp::BORDER,
@@ -200,7 +200,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   42,
 				   dcp::Time (0, 1, 2, 208, 250),
 				   dcp::Time (0, 1, 4, 10, 250),
-				   89,
+				   0.89,
 				   dcp::TOP,
 				   "At home it depends how I feel.\"",
 				   dcp::BORDER,
@@ -215,7 +215,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   42,
 				   dcp::Time (0, 1, 2, 208, 250),
 				   dcp::Time (0, 1, 4, 10, 250),
-				   95,
+				   0.95,
 				   dcp::TOP,
 				   "I spent a long weekend in Brighton",
 				   dcp::BORDER,
@@ -233,7 +233,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   42,
 				   dcp::Time (0, 1, 15, 42, 250),
 				   dcp::Time (0, 1, 16, 42, 250),
-				   89,
+				   0.89,
 				   dcp::TOP,
 				   "With the legendary Miss Enid Blyton",
 				   dcp::BORDER,
@@ -248,7 +248,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   42,
 				   dcp::Time (0, 1, 15, 42, 250),
 				   dcp::Time (0, 1, 16, 42, 250),
-				   95,
+				   0.95,
 				   dcp::TOP,
 				   "She said \"you be Noddy",
 				   dcp::BORDER,
@@ -266,7 +266,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   42,
 				   dcp::Time (0, 1, 27, 115, 250),
 				   dcp::Time (0, 1, 28, 208, 250),
-				   89,
+				   0.89,
 				   dcp::TOP,
 				   "That curious creature the Sphinx",
 				   dcp::BORDER,
@@ -281,7 +281,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   42,
 				   dcp::Time (0, 1, 27, 115, 250),
 				   dcp::Time (0, 1, 28, 208, 250),
-				   95,
+				   0.95,
 				   dcp::TOP,
 				   "Is smarter than anyone thinks",
 				   dcp::BORDER,
@@ -299,7 +299,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   42,
 				   dcp::Time (0, 1, 42, 229, 250),
 				   dcp::Time (0, 1, 45, 62, 250),
-				   89,
+				   0.89,
 				   dcp::TOP,
 				   "It sits there and smirks",
 				   dcp::BORDER,
@@ -314,7 +314,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   42,
 				   dcp::Time (0, 1, 42, 229, 250),
 				   dcp::Time (0, 1, 45, 62, 250),
-				   95,
+				   0.95,
 				   dcp::TOP,
 				   "And you don't think it works",
 				   dcp::BORDER,
@@ -332,7 +332,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   42,
 				   dcp::Time (0, 1, 45, 146, 250),
 				   dcp::Time (0, 1, 47, 94, 250),
-				   89,
+				   0.89,
 				   dcp::TOP,
 				   "Then when you're not looking, it winks.",
 				   dcp::BORDER,
@@ -347,7 +347,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   42,
 				   dcp::Time (0, 1, 45, 146, 250),
 				   dcp::Time (0, 1, 47, 94, 250),
-				   95,
+				   0.95,
 				   dcp::TOP,
 				   "When it snows you will find Sister Sledge",
 				   dcp::BORDER,
@@ -365,7 +365,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   42,
 				   dcp::Time (0, 1, 47, 146, 250),
 				   dcp::Time (0, 1, 48, 167, 250),
-				   89,
+				   0.89,
 				   dcp::TOP,
 				   "Out mooning, at night, on the ledge",
 				   dcp::BORDER,
@@ -380,7 +380,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   42,
 				   dcp::Time (0, 1, 47, 146, 250),
 				   dcp::Time (0, 1, 48, 167, 250),
-				   95,
+				   0.95,
 				   dcp::TOP,
 				   "One storey down",
 				   dcp::BORDER,
@@ -398,7 +398,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   42,
 				   dcp::Time (0, 2, 5, 208, 250),
 				   dcp::Time (0, 2, 7, 31, 250),
-				   89,
+				   0.89,
 				   dcp::TOP,
 				   "HELLO",
 				   dcp::BORDER,
@@ -413,7 +413,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   42,
 				   dcp::Time (0, 2, 5, 208, 250),
 				   dcp::Time (0, 2, 7, 31, 250),
-				   95,
+				   0.95,
 				   dcp::TOP,
 				   "WORLD",
 				   dcp::BORDER,
diff --git a/test/text_test.cc b/test/text_test.cc
index b8d76207..6749a753 100644
--- a/test/text_test.cc
+++ b/test/text_test.cc
@@ -32,7 +32,7 @@ BOOST_AUTO_TEST_CASE (text_test1)
 	text->add_child_text("Hello world");
 
 	dcp::Text t (cxml::NodePtr (new cxml::Node (text)), 250);
-	BOOST_CHECK_CLOSE (t.v_position, 4.2, 0.001);
+	BOOST_CHECK_CLOSE (t.v_position, 0.042, 0.001);
 	BOOST_CHECK_EQUAL (t.v_align, dcp::TOP);
 	BOOST_CHECK_EQUAL (t.text, "Hello world");
 }
@@ -47,7 +47,7 @@ BOOST_AUTO_TEST_CASE (text_test2)
 	text->add_child_text("Hello world");
 
 	dcp::Text t (cxml::NodePtr (new cxml::Node (text)), 250);
-	BOOST_CHECK_CLOSE (t.v_position, 4.2, 0.001);
+	BOOST_CHECK_CLOSE (t.v_position, 0.042, 0.001);
 	BOOST_CHECK_EQUAL (t.v_align, dcp::TOP);
 	BOOST_CHECK_EQUAL (t.text, "Hello world");
 }