c++11 tidying.

[dcpomatic.git] / test / burnt_subtitle_test.cc

diff --git a/test/burnt_subtitle_test.cc b/test/burnt_subtitle_test.cc
index 4a056dbf70e949af532eb6cbe43eeb9d54bc1e34..edad2c674ea8ae39ff07f6f29f5a2c06d31a692f 100644 (file)
--- a/test/burnt_subtitle_test.cc
+++ b/test/burnt_subtitle_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -51,16 +51,17 @@ using std::cout;
 using std::map;
 using std::shared_ptr;
 using std::dynamic_pointer_cast;
+using std::make_shared;
 using namespace dcpomatic;
 
 /** Build a small DCP with no picture and a single subtitle overlaid onto it from a SubRip file */
 BOOST_AUTO_TEST_CASE (burnt_subtitle_test_subrip)
 {
-       shared_ptr<Film> film = new_test_film ("burnt_subtitle_test_subrip");
+       auto film = new_test_film ("burnt_subtitle_test_subrip");
        film->set_container (Ratio::from_id ("185"));
        film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
        film->set_name ("frobozz");
-       shared_ptr<StringText> content (new StringText (film, "test/data/subrip2.srt"));
+       auto content = make_shared<StringText>(film, "test/data/subrip2.srt");
        content->subtitle->set_use (true);
        content->subtitle->set_burn (true);
        film->examine_and_add_content (content);
@@ -74,11 +75,11 @@ BOOST_AUTO_TEST_CASE (burnt_subtitle_test_subrip)
 /** Build a small DCP with no picture and a single subtitle overlaid onto it from a DCP XML file */
 BOOST_AUTO_TEST_CASE (burnt_subtitle_test_dcp)
 {
-       shared_ptr<Film> film = new_test_film ("burnt_subtitle_test_dcp");
+       auto film = new_test_film ("burnt_subtitle_test_dcp");
        film->set_container (Ratio::from_id ("185"));
        film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
        film->set_name ("frobozz");
-       shared_ptr<DCPTextContent> content (new DCPTextContent (film, "test/data/dcp_sub.xml"));
+       auto content = make_shared<DCPTextContent>(film, "test/data/dcp_sub.xml");
        content->subtitle->set_use (true);
        film->examine_and_add_content (content);
        BOOST_REQUIRE (!wait_for_jobs());
@@ -91,7 +92,7 @@ BOOST_AUTO_TEST_CASE (burnt_subtitle_test_dcp)
 /** Burn some subtitles into an existing DCP to check the colour conversion */
 BOOST_AUTO_TEST_CASE (burnt_subtitle_test_onto_dcp)
 {
-       shared_ptr<Film> film = new_test_film ("burnt_subtitle_test_onto_dcp");
+       auto film = new_test_film ("burnt_subtitle_test_onto_dcp");
        film->set_container (Ratio::from_id ("185"));
        film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
        film->set_name ("frobozz");
@@ -101,13 +102,13 @@ BOOST_AUTO_TEST_CASE (burnt_subtitle_test_onto_dcp)
        BOOST_REQUIRE (!wait_for_jobs());
 
        Config::instance()->set_log_types (Config::instance()->log_types() | LogEntry::TYPE_DEBUG_ENCODE);
-       shared_ptr<Film> film2 = new_test_film ("burnt_subtitle_test_onto_dcp2");
+       auto film2 = new_test_film ("burnt_subtitle_test_onto_dcp2");
        film2->set_container (Ratio::from_id ("185"));
        film2->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
        film2->set_name ("frobozz");
-       shared_ptr<DCPContent> background_dcp (new DCPContent(film2, film->dir(film->dcp_name())));
+       auto background_dcp = make_shared<DCPContent>(film2, film->dir(film->dcp_name()));
        film2->examine_and_add_content (background_dcp);
-       shared_ptr<StringText> sub = dynamic_pointer_cast<StringText> (
+       auto sub = dynamic_pointer_cast<StringText> (
                content_factory(film2, "test/data/subrip2.srt").front()
                );
        sub->subtitle->set_burn (true);
@@ -126,12 +127,12 @@ BOOST_AUTO_TEST_CASE (burnt_subtitle_test_onto_dcp)
        BOOST_REQUIRE_EQUAL (dcp.cpls().front()->reels().size(), 1);
        BOOST_REQUIRE (dcp.cpls().front()->reels().front()->main_picture());
        BOOST_REQUIRE (dcp.cpls().front()->reels().front()->main_picture()->asset());
-       shared_ptr<const dcp::MonoPictureAsset> pic = dynamic_pointer_cast<dcp::ReelMonoPictureAsset> (
+       auto pic = dynamic_pointer_cast<dcp::ReelMonoPictureAsset> (
                dcp.cpls().front()->reels().front()->main_picture()
                )->mono_asset();
        BOOST_REQUIRE (pic);
-       shared_ptr<const dcp::MonoPictureFrame> frame = pic->start_read()->get_frame (12);
-       shared_ptr<dcp::OpenJPEGImage> xyz = frame->xyz_image ();
+       auto frame = pic->start_read()->get_frame(12);
+       auto xyz = frame->xyz_image ();
        BOOST_CHECK_EQUAL (xyz->size().width, 1998);
        BOOST_CHECK_EQUAL (xyz->size().height, 1080);