Merge branch 'master' of ssh://git.carlh.net/home/carl/git/libdcp

[libdcp.git] / test / dcp_font_test.cc

diff --git a/test/dcp_font_test.cc b/test/dcp_font_test.cc
index 83aef25582d992c6ed5936e25d988981391f9816..d7300ba09e03d9256049a8b83ccab9b804a52af9 100644 (file)
--- a/test/dcp_font_test.cc
+++ b/test/dcp_font_test.cc
@@ -1,20 +1,20 @@
 /*
     Copyright (C) 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/>.
 */
 
 #include "interop_subtitle_asset.h"
@@ -57,7 +57,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);
@@ -94,7 +94,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);