Make CPL annotation_text optional.

[libdcp.git] / test / dcp_font_test.cc

diff --git a/test/dcp_font_test.cc b/test/dcp_font_test.cc
index 83aef25582d992c6ed5936e25d988981391f9816..1a78bfd28365e7b9d30956d766a3d311d8e5d022 100644 (file)
--- a/test/dcp_font_test.cc
+++ b/test/dcp_font_test.cc
@@ -1,20 +1,34 @@
 /*
-    Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2015-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"
@@ -30,8 +44,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;
 using boost::shared_array;
 
 /** Create a DCP with interop subtitles and check that the font is written and read back correctly */
@@ -41,9 +55,9 @@ BOOST_AUTO_TEST_CASE (interop_dcp_font_test)
        dcp::DCP dcp (directory);
 
        shared_ptr<dcp::InteropSubtitleAsset> subs (new dcp::InteropSubtitleAsset ());
-       subs->add_font ("theFontId", "test/data/dummy.ttf");
+       subs->add_font ("theFontId", dcp::ArrayData("test/data/dummy.ttf"));
        subs->write (directory / "frobozz.xml");
-       check_file ("test/data/dummy.ttf", "build/test/interop_dcp_font_test/dummy.ttf");
+       check_file ("test/data/dummy.ttf", "build/test/interop_dcp_font_test/font_0.ttf");
 
        shared_ptr<dcp::Reel> reel (new dcp::Reel ());
        reel->add (shared_ptr<dcp::ReelAsset> (new dcp::ReelSubtitleAsset (subs, dcp::Fraction (24, 1), 24, 0)));
@@ -57,7 +71,7 @@ BOOST_AUTO_TEST_CASE (interop_dcp_font_test)
        dcp::DCP dcp2 (directory);
        dcp2.read ();
        shared_ptr<dcp::SubtitleAsset> subs2 = dynamic_pointer_cast<dcp::SubtitleAsset> (
-               dcp2.cpls().front()->reels().front()->main_subtitle()->asset_ref().object()
+               dcp2.cpls().front()->reels().front()->main_subtitle()->asset_ref().asset()
                );
        BOOST_REQUIRE (subs2);
        BOOST_REQUIRE_EQUAL (subs2->_fonts.size(), 1);
@@ -69,7 +83,7 @@ BOOST_AUTO_TEST_CASE (interop_dcp_font_test)
        fread (ref.get(), 1, size, f);
        fclose (f);
 
-       BOOST_CHECK_EQUAL (memcmp (subs2->_fonts.front().data.data().get(), ref.get(), size), 0);
+       BOOST_CHECK_EQUAL (memcmp (subs2->_fonts.front().data.data(), ref.get(), size), 0);
 }
 
 /** Create a DCP with SMPTE subtitles and check that the font is written and read back correctly */
@@ -79,7 +93,7 @@ BOOST_AUTO_TEST_CASE (smpte_dcp_font_test)
        dcp::DCP dcp (directory);
 
        shared_ptr<dcp::SMPTESubtitleAsset> subs (new dcp::SMPTESubtitleAsset ());
-       subs->add_font ("theFontId", "test/data/dummy.ttf");
+       subs->add_font ("theFontId", dcp::ArrayData("test/data/dummy.ttf"));
        subs->write (directory / "frobozz.mxf");
 
        shared_ptr<dcp::Reel> reel (new dcp::Reel ());
@@ -94,7 +108,7 @@ BOOST_AUTO_TEST_CASE (smpte_dcp_font_test)
        dcp::DCP dcp2 (directory);
        dcp2.read ();
        shared_ptr<dcp::SubtitleAsset> subs2 = dynamic_pointer_cast<dcp::SubtitleAsset> (
-               dcp2.cpls().front()->reels().front()->main_subtitle()->asset_ref().object()
+               dcp2.cpls().front()->reels().front()->main_subtitle()->asset_ref().asset()
                );
        BOOST_REQUIRE (subs2);
        BOOST_REQUIRE_EQUAL (subs2->_fonts.size(), 1);
@@ -107,5 +121,5 @@ BOOST_AUTO_TEST_CASE (smpte_dcp_font_test)
        fclose (f);
 
        BOOST_REQUIRE (subs2->_fonts.front().data.data());
-       BOOST_CHECK_EQUAL (memcmp (subs2->_fonts.front().data.data().get(), ref.get(), size), 0);
+       BOOST_CHECK_EQUAL (memcmp (subs2->_fonts.front().data.data(), ref.get(), size), 0);
 }