X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fread_interop_subtitle_test.cc;h=d37e60d4dad577ea54c43762cce1d3a085a45dc9;hb=49b30838def07c225481def5e54458c22f6ceece;hp=19d1cad804b975501a07f0a1b71f5776ea8d6fa3;hpb=ff7e50bfae825ea01d010ba5f8fde44668ddeb9e;p=libdcp.git

diff --git a/test/read_interop_subtitle_test.cc b/test/read_interop_subtitle_test.cc
index 19d1cad8..d37e60d4 100644
--- a/test/read_interop_subtitle_test.cc
+++ b/test/read_interop_subtitle_test.cc
@@ -40,8 +40,8 @@
 
 using std::list;
 using std::string;
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+using std::shared_ptr;
+using std::dynamic_pointer_cast;
 
 /** Load some subtitle content from Interop XML and check that it is read correctly */
 BOOST_AUTO_TEST_CASE (read_interop_subtitle_test1)
@@ -53,17 +53,17 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test1)
 	BOOST_CHECK_EQUAL (subs.reel_number(), "1");
 	BOOST_CHECK_EQUAL (subs.language(), "French");
 
-	list<shared_ptr<dcp::LoadFontNode> > lfn = subs.load_font_nodes ();
+	auto lfn = subs.load_font_nodes ();
 	BOOST_REQUIRE_EQUAL (lfn.size(), 1);
 	shared_ptr<dcp::InteropLoadFontNode> interop_lfn = dynamic_pointer_cast<dcp::InteropLoadFontNode> (lfn.front ());
 	BOOST_REQUIRE (interop_lfn);
 	BOOST_CHECK_EQUAL (interop_lfn->id, "theFontId");
 	BOOST_CHECK_EQUAL (interop_lfn->uri, "arial.ttf");
 
-	list<shared_ptr<dcp::Subtitle> > s = subs.subtitles_during (dcp::Time (0, 0, 6, 1, 250), dcp::Time (0, 0, 6, 2, 250), false);
+	auto s = subs.subtitles_during (dcp::Time (0, 0, 6, 1, 250), dcp::Time (0, 0, 6, 2, 250), false);
 	BOOST_REQUIRE_EQUAL (s.size(), 1);
-	BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.front()));
-	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.front()), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.front()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.front()), dcp::SubtitleString (
 				   string ("theFontId"),
 				   false,
 				   false,
@@ -87,8 +87,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test1)
 
 	s = subs.subtitles_during (dcp::Time (0, 0, 7, 190, 250), dcp::Time (0, 0, 7, 191, 250), false);
 	BOOST_REQUIRE_EQUAL (s.size(), 2);
-	BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.front()));
-	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.front()), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.front()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.front()), dcp::SubtitleString (
 				   string ("theFontId"),
 				   true,
 				   false,
@@ -109,8 +109,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test1)
 				   dcp::Time (0, 0, 0, 1, 250),
 				   dcp::Time (0, 0, 0, 1, 250)
 				   ));
-	BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.back()));
-	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.back()), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.back()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
 				   string ("theFontId"),
 				   false,
 				   false,
@@ -134,8 +134,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test1)
 
 	s = subs.subtitles_during (dcp::Time (0, 0, 11, 95, 250), dcp::Time (0, 0, 11, 96, 250), false);
 	BOOST_REQUIRE_EQUAL (s.size(), 1);
-	BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.back()));
-	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.back()), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.back()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
 				   string ("theFontId"),
 				   false,
 				   false,
@@ -159,8 +159,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test1)
 
 	s = subs.subtitles_during (dcp::Time (0, 0, 14, 42, 250), dcp::Time (0, 0, 14, 43, 250), false);
 	BOOST_REQUIRE_EQUAL (s.size(), 1);
-	BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.back()));
-	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.back()), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.back()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
 				   string ("theFontId"),
 				   false,
 				   true,
@@ -188,10 +188,10 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 {
 	dcp::InteropSubtitleAsset subs ("test/data/subs2.xml");
 
-	list<shared_ptr<dcp::Subtitle> > s = subs.subtitles_during (dcp::Time (0, 0, 42, 100, 250), dcp::Time (0, 0, 42, 101, 250), false);
+	auto s = subs.subtitles_during (dcp::Time (0, 0, 42, 100, 250), dcp::Time (0, 0, 42, 101, 250), false);
 	BOOST_REQUIRE_EQUAL (s.size(), 2);
-	BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.front()));
-	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.front()), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.front()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.front()), dcp::SubtitleString (
 				   string ("theFont"),
 				   true,
 				   false,
@@ -212,8 +212,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   dcp::Time (0, 0, 0, 0, 250),
 				   dcp::Time (0, 0, 0, 0, 250)
 				   ));
-	BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.back()));
-	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.back()), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.back()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
 				   string ("theFont"),
 				   true,
 				   false,
@@ -237,8 +237,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 
 	s = subs.subtitles_during (dcp::Time (0, 0, 50, 50, 250), dcp::Time (0, 0, 50, 51, 250), false);
 	BOOST_REQUIRE_EQUAL (s.size(), 2);
-	BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.front()));
-	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.front()), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.front()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.front()), dcp::SubtitleString (
 				   string ("theFont"),
 				   true,
 				   false,
@@ -259,8 +259,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   dcp::Time (0, 0, 0, 0, 250),
 				   dcp::Time (0, 0, 0, 0, 250)
 				   ));
-	BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.back()));
-	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.back()), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.back()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
 				   string ("theFont"),
 				   true,
 				   false,
@@ -284,8 +284,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 
 	s = subs.subtitles_during (dcp::Time (0, 1, 2, 300, 250), dcp::Time (0, 1, 2, 301, 250), false);
 	BOOST_REQUIRE_EQUAL (s.size(), 2);
-	BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.front()));
-	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.front()), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.front()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.front()), dcp::SubtitleString (
 				   string ("theFont"),
 				   true,
 				   false,
@@ -306,8 +306,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   dcp::Time (0, 0, 0, 0, 250),
 				   dcp::Time (0, 0, 0, 0, 250)
 				   ));
-	BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.back()));
-	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.back()), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.back()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
 				   string ("theFont"),
 				   true,
 				   false,
@@ -331,8 +331,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 
 	s = subs.subtitles_during (dcp::Time (0, 1, 15, 50, 250), dcp::Time (0, 1, 15, 51, 250), false);
 	BOOST_REQUIRE_EQUAL (s.size(), 2);
-	BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.front()));
-	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.front()), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.front()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.front()), dcp::SubtitleString (
 				   string ("theFont"),
 				   true,
 				   false,
@@ -353,8 +353,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   dcp::Time (0, 0, 0, 0, 250),
 				   dcp::Time (0, 0, 0, 0, 250)
 				   ));
-	BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.back()));
-	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.back()), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.back()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
 				   string ("theFont"),
 				   true,
 				   false,
@@ -378,8 +378,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 
 	s = subs.subtitles_during (dcp::Time (0, 1, 27, 200, 250), dcp::Time (0, 1, 27, 201, 250), false);
 	BOOST_REQUIRE_EQUAL (s.size(), 2);
-	BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.front()));
-	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.front()), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.front()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.front()), dcp::SubtitleString (
 				   string ("theFont"),
 				   true,
 				   false,
@@ -400,8 +400,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   dcp::Time (0, 0, 0, 0, 250),
 				   dcp::Time (0, 0, 0, 0, 250)
 				   ));
-	BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.back()));
-	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.back()), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.back()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
 				   string ("theFont"),
 				   true,
 				   false,
@@ -425,8 +425,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 
 	s = subs.subtitles_during (dcp::Time (0, 1, 42, 300, 250), dcp::Time (0, 1, 42, 301, 250), false);
 	BOOST_REQUIRE_EQUAL (s.size(), 2);
-	BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.front()));
-	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.front()), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.front()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.front()), dcp::SubtitleString (
 				   string ("theFont"),
 				   false,
 				   false,
@@ -447,8 +447,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   dcp::Time (0, 0, 0, 0, 250),
 				   dcp::Time (0, 0, 0, 0, 250)
 				   ));
-	BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.back()));
-	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.back()), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.back()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
 				   string ("theFont"),
 				   false,
 				   false,
@@ -472,8 +472,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 
 	s = subs.subtitles_during (dcp::Time (0, 1, 45, 200, 250), dcp::Time (0, 1, 45, 201, 250), false);
 	BOOST_REQUIRE_EQUAL (s.size(), 2);
-	BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.front()));
-	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.front()), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.front()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.front()), dcp::SubtitleString (
 				   string ("theFont"),
 				   false,
 				   false,
@@ -494,8 +494,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   dcp::Time (0, 0, 0, 0, 250),
 				   dcp::Time (0, 0, 0, 0, 250)
 				   ));
-	BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.back()));
-	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.back()), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.back()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
 				   string ("theFont"),
 				   false,
 				   false,
@@ -519,8 +519,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 
 	s = subs.subtitles_during (dcp::Time (0, 1, 47, 249, 250), dcp::Time (0, 1, 47, 250, 250), false);
 	BOOST_REQUIRE_EQUAL (s.size(), 2);
-	BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.front()));
-	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.front()), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.front()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.front()), dcp::SubtitleString (
 				   string ("theFont"),
 				   false,
 				   false,
@@ -541,8 +541,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   dcp::Time (0, 0, 0, 0, 250),
 				   dcp::Time (0, 0, 0, 0, 250)
 				   ));
-	BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.back()));
-	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.back()), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.back()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
 				   string ("theFont"),
 				   false,
 				   false,
@@ -566,8 +566,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 
 	s = subs.subtitles_during (dcp::Time (0, 2, 6, 210, 250), dcp::Time (0, 2, 6, 211, 250), false);
 	BOOST_REQUIRE_EQUAL (s.size(), 2);
-	BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.front()));
-	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.front()), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.front()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.front()), dcp::SubtitleString (
 				   string ("theFont"),
 				   true,
 				   false,
@@ -588,8 +588,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   dcp::Time (0, 0, 0, 0, 250),
 				   dcp::Time (0, 0, 0, 0, 250)
 				   ));
-	BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.back()));
-	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.back()), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.back()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
 				   string ("theFont"),
 				   true,
 				   false,
@@ -618,7 +618,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test3)
 	dcp::InteropSubtitleAsset subs ("test/data/subs3.xml");
 
 	BOOST_REQUIRE_EQUAL (subs.subtitles().size(), 1);
-	shared_ptr<dcp::SubtitleImage> si = dynamic_pointer_cast<dcp::SubtitleImage>(subs.subtitles().front());
+	auto si = dynamic_pointer_cast<const dcp::SubtitleImage>(subs.subtitles().front());
 	BOOST_REQUIRE (si);
-	BOOST_CHECK (si->png_image() == dcp::Data("test/data/sub.png"));
+	BOOST_CHECK (si->png_image() == dcp::ArrayData("test/data/sub.png"));
 }