diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-12-23 16:30:01 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-12-23 17:35:02 +0100 |
| commit | 52d807654169d6443909c1d5dd20a155801faa26 (patch) | |
| tree | 727774d21ea1f4b54ccd61a09127894cb8d572ef /src/interop_text_asset.cc | |
| parent | a6ccc587277b848b4a60c07456b11eb1b076d181 (diff) | |
Remove String::compose and use fmt instead.
Diffstat (limited to 'src/interop_text_asset.cc')
| -rw-r--r-- | src/interop_text_asset.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/interop_text_asset.cc b/src/interop_text_asset.cc index 4650904f..78eeb7ce 100644 --- a/src/interop_text_asset.cc +++ b/src/interop_text_asset.cc @@ -37,7 +37,6 @@ */ -#include "compose.hpp" #include "dcp_assert.h" #include "equality_options.h" #include "filesystem.h" @@ -53,7 +52,7 @@ LIBDCP_DISABLE_WARNINGS #include <libxml++/libxml++.h> LIBDCP_ENABLE_WARNINGS -#include <fmt/core.h> +#include <fmt/format.h> #include <boost/weak_ptr.hpp> #include <cmath> #include <cstdio> @@ -96,7 +95,7 @@ InteropTextAsset::InteropTextAsset(boost::filesystem::path file) for (auto i: _texts) { auto si = dynamic_pointer_cast<TextImage>(i); if (si) { - si->read_png_file (file.parent_path() / String::compose("%1.png", si->id())); + si->read_png_file (file.parent_path() / fmt::format("{}.png", si->id())); } } } @@ -136,7 +135,7 @@ void InteropTextAsset::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()); + auto const uri = fmt::format("font_{}.ttf", _load_font_nodes.size()); _load_font_nodes.push_back (make_shared<InteropLoadFontNode>(load_id, uri)); } @@ -208,7 +207,7 @@ InteropTextAsset::write(boost::filesystem::path p) const /* Image subtitles */ for (auto i: _texts) { if (auto im = dynamic_pointer_cast<dcp::TextImage>(i)) { - im->write_png_file(p.parent_path() / String::compose("%1.png", im->id())); + im->write_png_file(p.parent_path() / fmt::format("{}.png", im->id())); } } |