diff options
| author | Carl Hetherington <cth@carlh.net> | 2022-03-15 11:28:05 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2022-03-19 23:04:35 +0100 |
| commit | 2516e657c80da672d1ea1ef5b5a189ef8799c070 (patch) | |
| tree | ec4150eb098f80ff3ea18b1ff1a5eab98cbd9b1f /src | |
| parent | d67964c10d6d0bdac09045e209ba0e99dbd761a3 (diff) | |
C++11 tidying.
Diffstat (limited to 'src')
| -rw-r--r-- | src/interop_subtitle_asset.cc | 12 |
1 files changed, 6 insertions, 6 deletions
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 <cstdio> -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<InteropLoadFontNode>(new InteropLoadFontNode(load_id, uri))); + _load_font_nodes.push_back (make_shared<InteropLoadFontNode>(load_id, uri)); } |
