Move some tests and rename one set.
[libdcp.git] / test / read_interop_subtitle_test.cc
index 7cbb5803c904a59fff390b927c5fcb45e8435e14..19d1cad804b975501a07f0a1b71f5776ea8d6fa3 100644 (file)
@@ -1,26 +1,42 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2019 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.
 */
 
 #include "interop_subtitle_asset.h"
 #include "interop_load_font_node.h"
 #include "subtitle_string.h"
+#include "subtitle_image.h"
 #include <boost/test/unit_test.hpp>
+#include <iostream>
 
 using std::list;
 using std::string;
@@ -44,12 +60,14 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test1)
        BOOST_CHECK_EQUAL (interop_lfn->id, "theFontId");
        BOOST_CHECK_EQUAL (interop_lfn->uri, "arial.ttf");
 
-       list<dcp::SubtitleString> s = subs.subtitles_during (dcp::Time (0, 0, 6, 1, 250), dcp::Time (0, 0, 6, 2, 250), false);
+       list<shared_ptr<dcp::Subtitle> > 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_CHECK_EQUAL (s.front(), dcp::SubtitleString (
+       BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.front()));
+       BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.front()), dcp::SubtitleString (
                                   string ("theFontId"),
                                   false,
                                   false,
+                                  false,
                                   dcp::Colour (255, 255, 255),
                                   39,
                                   1.0,
@@ -59,6 +77,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test1)
                                   dcp::HALIGN_CENTER,
                                   0.15,
                                   dcp::VALIGN_BOTTOM,
+                                  dcp::DIRECTION_LTR,
                                   "My jacket was Idi Amin's",
                                   dcp::BORDER,
                                   dcp::Colour (0, 0, 0),
@@ -68,10 +87,12 @@ 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_CHECK_EQUAL (s.front(), dcp::SubtitleString (
+       BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.front()));
+       BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.front()), dcp::SubtitleString (
                                   string ("theFontId"),
                                   true,
                                   false,
+                                  false,
                                   dcp::Colour (255, 255, 255),
                                   39,
                                   1.0,
@@ -81,16 +102,19 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test1)
                                   dcp::HALIGN_CENTER,
                                   0.21,
                                   dcp::VALIGN_BOTTOM,
+                                  dcp::DIRECTION_LTR,
                                   "My corset was H.M. The Queen's",
                                   dcp::BORDER,
                                   dcp::Colour (0, 0, 0),
                                   dcp::Time (0, 0, 0, 1, 250),
                                   dcp::Time (0, 0, 0, 1, 250)
                                   ));
-       BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
+       BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.back()));
+       BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.back()), dcp::SubtitleString (
                                   string ("theFontId"),
                                   false,
                                   false,
+                                  false,
                                   dcp::Colour (255, 255, 255),
                                   39,
                                   1.0,
@@ -100,6 +124,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test1)
                                   dcp::HALIGN_CENTER,
                                   0.15,
                                   dcp::VALIGN_BOTTOM,
+                                  dcp::DIRECTION_LTR,
                                   "My large wonderbra",
                                   dcp::BORDER,
                                   dcp::Colour (0, 0, 0),
@@ -109,10 +134,12 @@ 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_CHECK_EQUAL (s.back(), dcp::SubtitleString (
+       BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.back()));
+       BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.back()), dcp::SubtitleString (
                                   string ("theFontId"),
                                   false,
                                   false,
+                                  false,
                                   dcp::Colour (255, 255, 255),
                                   39,
                                   1.0,
@@ -122,6 +149,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test1)
                                   dcp::HALIGN_CENTER,
                                   0.15,
                                   dcp::VALIGN_BOTTOM,
+                                  dcp::DIRECTION_LTR,
                                   "Once belonged to the Shah",
                                   dcp::BORDER,
                                   dcp::Colour (0, 0, 0),
@@ -131,10 +159,12 @@ 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_CHECK_EQUAL (s.back(), dcp::SubtitleString (
+       BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.back()));
+       BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.back()), dcp::SubtitleString (
                                   string ("theFontId"),
                                   false,
-                                  false,
+                                  true,
+                                  true,
                                   dcp::Colour (255, 255, 255),
                                   39,
                                   1.0,
@@ -144,6 +174,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test1)
                                   dcp::HALIGN_CENTER,
                                   0.15,
                                   dcp::VALIGN_BOTTOM,
+                                  dcp::DIRECTION_LTR,
                                   "And these are Roy Hattersley's jeans",
                                   dcp::BORDER,
                                   dcp::Colour (0, 0, 0),
@@ -157,12 +188,14 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 {
        dcp::InteropSubtitleAsset subs ("test/data/subs2.xml");
 
-       list<dcp::SubtitleString> s = subs.subtitles_during (dcp::Time (0, 0, 42, 100, 250), dcp::Time (0, 0, 42, 101, 250), false);
+       list<shared_ptr<dcp::Subtitle> > 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_CHECK_EQUAL (s.front(), dcp::SubtitleString (
+       BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.front()));
+       BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.front()), dcp::SubtitleString (
                                   string ("theFont"),
                                   true,
                                   false,
+                                  false,
                                   dcp::Colour (255, 255, 255),
                                   42,
                                   1.0,
@@ -172,16 +205,19 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
                                   dcp::HALIGN_CENTER,
                                   0.89,
                                   dcp::VALIGN_TOP,
+                                  dcp::DIRECTION_LTR,
                                   "At afternoon tea with John Peel",
                                   dcp::BORDER,
                                   dcp::Colour (0, 0, 0),
                                   dcp::Time (0, 0, 0, 0, 250),
                                   dcp::Time (0, 0, 0, 0, 250)
                                   ));
-       BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
+       BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.back()));
+       BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.back()), dcp::SubtitleString (
                                   string ("theFont"),
                                   true,
                                   false,
+                                  false,
                                   dcp::Colour (255, 255, 255),
                                   42,
                                   1.0,
@@ -191,6 +227,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
                                   dcp::HALIGN_CENTER,
                                   0.95,
                                   dcp::VALIGN_TOP,
+                                  dcp::DIRECTION_LTR,
                                   "I enquired if his accent was real",
                                   dcp::BORDER,
                                   dcp::Colour (0, 0, 0),
@@ -200,10 +237,12 @@ 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_CHECK_EQUAL (s.front(), dcp::SubtitleString (
+       BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.front()));
+       BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.front()), dcp::SubtitleString (
                                   string ("theFont"),
                                   true,
                                   false,
+                                  false,
                                   dcp::Colour (255, 255, 255),
                                   42,
                                   1.0,
@@ -213,16 +252,19 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
                                   dcp::HALIGN_CENTER,
                                   0.89,
                                   dcp::VALIGN_TOP,
+                                  dcp::DIRECTION_LTR,
                                   "He said \"out of the house",
                                   dcp::BORDER,
                                   dcp::Colour (0, 0, 0),
                                   dcp::Time (0, 0, 0, 0, 250),
                                   dcp::Time (0, 0, 0, 0, 250)
                                   ));
-       BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
+       BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.back()));
+       BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.back()), dcp::SubtitleString (
                                   string ("theFont"),
                                   true,
                                   false,
+                                  false,
                                   dcp::Colour (255, 255, 255),
                                   42,
                                   1.0,
@@ -232,6 +274,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
                                   dcp::HALIGN_CENTER,
                                   0.95,
                                   dcp::VALIGN_TOP,
+                                  dcp::DIRECTION_LTR,
                                   "I'm incredibly scouse",
                                   dcp::BORDER,
                                   dcp::Colour (0, 0, 0),
@@ -241,10 +284,12 @@ 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_CHECK_EQUAL (s.front(), dcp::SubtitleString (
+       BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.front()));
+       BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.front()), dcp::SubtitleString (
                                   string ("theFont"),
                                   true,
                                   false,
+                                  false,
                                   dcp::Colour (255, 255, 255),
                                   42,
                                   1.0,
@@ -254,16 +299,19 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
                                   dcp::HALIGN_CENTER,
                                   0.89,
                                   dcp::VALIGN_TOP,
+                                  dcp::DIRECTION_LTR,
                                   "At home it depends how I feel.\"",
                                   dcp::BORDER,
                                   dcp::Colour (0, 0, 0),
                                   dcp::Time (0, 0, 0, 0, 250),
                                   dcp::Time (0, 0, 0, 0, 250)
                                   ));
-       BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
+       BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.back()));
+       BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.back()), dcp::SubtitleString (
                                   string ("theFont"),
                                   true,
                                   false,
+                                  false,
                                   dcp::Colour (255, 255, 255),
                                   42,
                                   1.0,
@@ -273,6 +321,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
                                   dcp::HALIGN_CENTER,
                                   0.95,
                                   dcp::VALIGN_TOP,
+                                  dcp::DIRECTION_LTR,
                                   "I spent a long weekend in Brighton",
                                   dcp::BORDER,
                                   dcp::Colour (0, 0, 0),
@@ -282,10 +331,12 @@ 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_CHECK_EQUAL (s.front(), dcp::SubtitleString (
+       BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.front()));
+       BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.front()), dcp::SubtitleString (
                                   string ("theFont"),
                                   true,
                                   false,
+                                  false,
                                   dcp::Colour (255, 255, 255),
                                   42,
                                   1.0,
@@ -295,16 +346,19 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
                                   dcp::HALIGN_CENTER,
                                   0.89,
                                   dcp::VALIGN_TOP,
+                                  dcp::DIRECTION_RTL,
                                   "With the legendary Miss Enid Blyton",
                                   dcp::BORDER,
                                   dcp::Colour (0, 0, 0),
                                   dcp::Time (0, 0, 0, 0, 250),
                                   dcp::Time (0, 0, 0, 0, 250)
                                   ));
-       BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
+       BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.back()));
+       BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.back()), dcp::SubtitleString (
                                   string ("theFont"),
                                   true,
                                   false,
+                                  false,
                                   dcp::Colour (255, 255, 255),
                                   42,
                                   1.0,
@@ -314,6 +368,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
                                   dcp::HALIGN_CENTER,
                                   0.95,
                                   dcp::VALIGN_TOP,
+                                  dcp::DIRECTION_TTB,
                                   "She said \"you be Noddy",
                                   dcp::BORDER,
                                   dcp::Colour (0, 0, 0),
@@ -323,10 +378,12 @@ 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_CHECK_EQUAL (s.front(), dcp::SubtitleString (
+       BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.front()));
+       BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.front()), dcp::SubtitleString (
                                   string ("theFont"),
                                   true,
                                   false,
+                                  false,
                                   dcp::Colour (255, 255, 255),
                                   42,
                                   1.0,
@@ -336,16 +393,19 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
                                   dcp::HALIGN_CENTER,
                                   0.89,
                                   dcp::VALIGN_TOP,
+                                  dcp::DIRECTION_BTT,
                                   "That curious creature the Sphinx",
                                   dcp::BORDER,
                                   dcp::Colour (0, 0, 0),
                                   dcp::Time (0, 0, 0, 0, 250),
                                   dcp::Time (0, 0, 0, 0, 250)
                                   ));
-       BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
+       BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.back()));
+       BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.back()), dcp::SubtitleString (
                                   string ("theFont"),
                                   true,
                                   false,
+                                  false,
                                   dcp::Colour (255, 255, 255),
                                   42,
                                   1.0,
@@ -355,6 +415,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
                                   dcp::HALIGN_CENTER,
                                   0.95,
                                   dcp::VALIGN_TOP,
+                                  dcp::DIRECTION_LTR,
                                   "Is smarter than anyone thinks",
                                   dcp::BORDER,
                                   dcp::Colour (0, 0, 0),
@@ -364,10 +425,12 @@ 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_CHECK_EQUAL (s.front(), dcp::SubtitleString (
+       BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.front()));
+       BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.front()), dcp::SubtitleString (
                                   string ("theFont"),
                                   false,
                                   false,
+                                  false,
                                   dcp::Colour (255, 255, 255),
                                   42,
                                   1.0,
@@ -377,16 +440,19 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
                                   dcp::HALIGN_CENTER,
                                   0.89,
                                   dcp::VALIGN_TOP,
+                                  dcp::DIRECTION_LTR,
                                   "It sits there and smirks",
                                   dcp::BORDER,
                                   dcp::Colour (0, 0, 0),
                                   dcp::Time (0, 0, 0, 0, 250),
                                   dcp::Time (0, 0, 0, 0, 250)
                                   ));
-       BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
+       BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.back()));
+       BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.back()), dcp::SubtitleString (
                                   string ("theFont"),
                                   false,
                                   false,
+                                  false,
                                   dcp::Colour (255, 255, 255),
                                   42,
                                   1.0,
@@ -396,6 +462,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
                                   dcp::HALIGN_CENTER,
                                   0.95,
                                   dcp::VALIGN_TOP,
+                                  dcp::DIRECTION_LTR,
                                   "And you don't think it works",
                                   dcp::BORDER,
                                   dcp::Colour (0, 0, 0),
@@ -405,10 +472,12 @@ 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_CHECK_EQUAL (s.front(), dcp::SubtitleString (
+       BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.front()));
+       BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.front()), dcp::SubtitleString (
                                   string ("theFont"),
                                   false,
                                   false,
+                                  false,
                                   dcp::Colour (255, 255, 255),
                                   42,
                                   1.0,
@@ -418,16 +487,19 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
                                   dcp::HALIGN_CENTER,
                                   0.89,
                                   dcp::VALIGN_TOP,
+                                  dcp::DIRECTION_LTR,
                                   "Then when you're not looking, it winks.",
                                   dcp::BORDER,
                                   dcp::Colour (0, 0, 0),
                                   dcp::Time (0, 0, 0, 0, 250),
                                   dcp::Time (0, 0, 0, 0, 250)
                                   ));
-       BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
+       BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.back()));
+       BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.back()), dcp::SubtitleString (
                                   string ("theFont"),
                                   false,
                                   false,
+                                  false,
                                   dcp::Colour (255, 255, 255),
                                   42,
                                   1.0,
@@ -437,6 +509,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
                                   dcp::HALIGN_CENTER,
                                   0.95,
                                   dcp::VALIGN_TOP,
+                                  dcp::DIRECTION_LTR,
                                   "When it snows you will find Sister Sledge",
                                   dcp::BORDER,
                                   dcp::Colour (0, 0, 0),
@@ -446,10 +519,12 @@ 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_CHECK_EQUAL (s.front(), dcp::SubtitleString (
+       BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.front()));
+       BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.front()), dcp::SubtitleString (
                                   string ("theFont"),
                                   false,
                                   false,
+                                  false,
                                   dcp::Colour (255, 255, 255),
                                   42,
                                   1.0,
@@ -459,16 +534,19 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
                                   dcp::HALIGN_CENTER,
                                   0.89,
                                   dcp::VALIGN_TOP,
+                                  dcp::DIRECTION_LTR,
                                   "Out mooning, at night, on the ledge",
                                   dcp::BORDER,
                                   dcp::Colour (0, 0, 0),
                                   dcp::Time (0, 0, 0, 0, 250),
                                   dcp::Time (0, 0, 0, 0, 250)
                                   ));
-       BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
+       BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.back()));
+       BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.back()), dcp::SubtitleString (
                                   string ("theFont"),
                                   false,
                                   false,
+                                  false,
                                   dcp::Colour (255, 255, 255),
                                   42,
                                   1.0,
@@ -478,6 +556,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
                                   dcp::HALIGN_CENTER,
                                   0.95,
                                   dcp::VALIGN_TOP,
+                                  dcp::DIRECTION_LTR,
                                   "One storey down",
                                   dcp::BORDER,
                                   dcp::Colour (0, 0, 0),
@@ -487,10 +566,12 @@ 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_CHECK_EQUAL (s.front(), dcp::SubtitleString (
+       BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.front()));
+       BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.front()), dcp::SubtitleString (
                                   string ("theFont"),
                                   true,
                                   false,
+                                  false,
                                   dcp::Colour (255, 255, 255),
                                   42,
                                   1.0,
@@ -500,16 +581,19 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
                                   dcp::HALIGN_CENTER,
                                   0.89,
                                   dcp::VALIGN_TOP,
+                                  dcp::DIRECTION_LTR,
                                   "HELLO",
                                   dcp::BORDER,
                                   dcp::Colour (0, 0, 0),
                                   dcp::Time (0, 0, 0, 0, 250),
                                   dcp::Time (0, 0, 0, 0, 250)
                                   ));
-       BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
+       BOOST_REQUIRE (dynamic_pointer_cast<dcp::SubtitleString>(s.back()));
+       BOOST_CHECK_EQUAL (*dynamic_pointer_cast<dcp::SubtitleString>(s.back()), dcp::SubtitleString (
                                   string ("theFont"),
                                   true,
                                   false,
+                                  false,
                                   dcp::Colour (255, 255, 255),
                                   42,
                                   1.0,
@@ -519,6 +603,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
                                   dcp::HALIGN_CENTER,
                                   0.95,
                                   dcp::VALIGN_TOP,
+                                  dcp::DIRECTION_LTR,
                                   "WORLD",
                                   dcp::BORDER,
                                   dcp::Colour (0, 0, 0),
@@ -526,3 +611,14 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
                                   dcp::Time (0, 0, 0, 0, 250)
                                   ));
 }
+
+/** And one with bitmap subtitles */
+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());
+       BOOST_REQUIRE (si);
+       BOOST_CHECK (si->png_image() == dcp::Data("test/data/sub.png"));
+}