diff options
| author | Carl Hetherington <cth@carlh.net> | 2022-06-03 01:31:27 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2022-06-07 10:30:31 +0200 |
| commit | dbac0c67c28595162ec2ec702e7af93616384d4c (patch) | |
| tree | 5276142ca2f8d3b228943929bedf93b3b06ca534 | |
| parent | dbfcc0fa0dccbc8f0b9056bf47dbab36aa69e55c (diff) | |
Tidying.
| -rw-r--r-- | src/lib/writer.cc | 27 | ||||
| -rw-r--r-- | test/dcp_subtitle_test.cc | 4 |
2 files changed, 15 insertions, 16 deletions
diff --git a/src/lib/writer.cc b/src/lib/writer.cc index bc0c5bf87..7792dda8e 100644 --- a/src/lib/writer.cc +++ b/src/lib/writer.cc @@ -19,29 +19,28 @@ */ -#include "writer.h" -#include "compose.hpp" -#include "film.h" -#include "ratio.h" -#include "log.h" -#include "dcpomatic_log.h" -#include "dcp_video.h" -#include "dcp_content_type.h" +#include "audio_buffers.h" #include "audio_mapping.h" +#include "compose.hpp" #include "config.h" -#include "job.h" #include "cross.h" -#include "audio_buffers.h" -#include "version.h" -#include "util.h" +#include "dcp_content_type.h" +#include "dcp_video.h" +#include "dcpomatic_log.h" +#include "film.h" +#include "job.h" +#include "log.h" +#include "ratio.h" #include "reel_writer.h" #include "text_content.h" +#include "util.h" +#include "version.h" +#include "writer.h" #include <dcp/cpl.h> #include <dcp/locale_convert.h> +#include <dcp/raw_convert.h> #include <dcp/reel_file_asset.h> -#include <fstream> #include <cerrno> -#include <iostream> #include <cfloat> #include <set> diff --git a/test/dcp_subtitle_test.cc b/test/dcp_subtitle_test.cc index 640f6510e..679325a91 100644 --- a/test/dcp_subtitle_test.cc +++ b/test/dcp_subtitle_test.cc @@ -186,8 +186,8 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_test4) auto film = new_test_film2 ("dcp_subtitle_test4", {content, content2}); film->set_interop (true); - content->only_text()->add_font (shared_ptr<Font> (new Font ("font1"))); - content2->only_text()->add_font (shared_ptr<Font> (new Font ("font2"))); + content->only_text()->add_font(make_shared<Font>("font1")); + content2->only_text()->add_font(make_shared<Font>("font2")); make_and_verify_dcp (film, { dcp::VerificationNote::Code::INVALID_STANDARD }); |