From 7aea3feff627335836ef82d00a3386296dadaefe Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 15 Mar 2022 11:28:05 +0100 Subject: C++11 tidying. --- src/interop_subtitle_asset.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/interop_subtitle_asset.cc b/src/interop_subtitle_asset.cc index d6feac5b..d5147284 100644 --- a/src/interop_subtitle_asset.cc +++ b/src/interop_subtitle_asset.cc @@ -56,13 +56,13 @@ LIBDCP_ENABLE_WARNINGS #include -using std::string; -using std::cout; using std::cerr; -using std::shared_ptr; +using std::cout; using std::dynamic_pointer_cast; -using std::vector; using std::make_shared; +using std::shared_ptr; +using std::string; +using std::vector; using boost::optional; using namespace dcp; @@ -118,7 +118,7 @@ InteropSubtitleAsset::xml_as_string () const root->add_child("Language")->add_child_text (_language); for (auto i: _load_font_nodes) { - xmlpp::Element* load_font = root->add_child("LoadFont"); + auto load_font = root->add_child("LoadFont"); load_font->set_attribute ("Id", i->id); load_font->set_attribute ("URI", i->uri); } @@ -134,7 +134,7 @@ InteropSubtitleAsset::add_font (string load_id, dcp::ArrayData data) { _fonts.push_back (Font(load_id, make_uuid(), data)); auto const uri = String::compose("font_%1.ttf", _load_font_nodes.size()); - _load_font_nodes.push_back (shared_ptr(new InteropLoadFontNode(load_id, uri))); + _load_font_nodes.push_back (make_shared(load_id, uri)); } -- cgit v1.2.3