From b03f2277a205ff7e7cdaa12c6e52322ea474a7af Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 30 Dec 2024 15:43:14 +0100 Subject: Bump libdcp for raw_convert changes. raw_convert is gone, so here we use fmt::{to_string,format} instead. Other raw_converts now use fast_float. --- src/lib/subtitle_analysis.cc | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'src/lib/subtitle_analysis.cc') diff --git a/src/lib/subtitle_analysis.cc b/src/lib/subtitle_analysis.cc index 2968416c6..5f7da6e02 100644 --- a/src/lib/subtitle_analysis.cc +++ b/src/lib/subtitle_analysis.cc @@ -23,17 +23,16 @@ #include "exceptions.h" #include #include -#include #include LIBDCP_DISABLE_WARNINGS #include LIBDCP_ENABLE_WARNINGS +#include using std::make_shared; using std::shared_ptr; using std::string; -using dcp::raw_convert; int const SubtitleAnalysis::_current_state_version = 1; @@ -70,18 +69,18 @@ SubtitleAnalysis::write (boost::filesystem::path path) const auto doc = make_shared(); xmlpp::Element* root = doc->create_root_node ("SubtitleAnalysis"); - cxml::add_text_child(root, "Version", raw_convert(_current_state_version)); + cxml::add_text_child(root, "Version", fmt::to_string(_current_state_version)); if (_bounding_box) { auto bounding_box = cxml::add_child(root, "BoundingBox"); - cxml::add_text_child(bounding_box, "X", raw_convert(_bounding_box->x)); - cxml::add_text_child(bounding_box, "Y", raw_convert(_bounding_box->y)); - cxml::add_text_child(bounding_box, "Width", raw_convert(_bounding_box->width)); - cxml::add_text_child(bounding_box, "Height", raw_convert(_bounding_box->height)); + cxml::add_text_child(bounding_box, "X", fmt::to_string(_bounding_box->x)); + cxml::add_text_child(bounding_box, "Y", fmt::to_string(_bounding_box->y)); + cxml::add_text_child(bounding_box, "Width", fmt::to_string(_bounding_box->width)); + cxml::add_text_child(bounding_box, "Height", fmt::to_string(_bounding_box->height)); } - cxml::add_text_child(root, "AnalysisXOffset", raw_convert(_analysis_x_offset)); - cxml::add_text_child(root, "AnalysisYOffset", raw_convert(_analysis_y_offset)); + cxml::add_text_child(root, "AnalysisXOffset", fmt::to_string(_analysis_x_offset)); + cxml::add_text_child(root, "AnalysisYOffset", fmt::to_string(_analysis_y_offset)); doc->write_to_file_formatted (path.string()); } -- cgit v1.2.3