summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2024-12-27 16:39:34 +0100
committerCarl Hetherington <cth@carlh.net>2024-12-27 16:39:34 +0100
commitcb5807f36990e63f2adc832c403912d41ab4345d (patch)
tree2f3f4ad3f0247f09f0ce25580c5e3c249ec1651f /src
parent2fe5f14f26904eed37c5c82dad5210de7254cf63 (diff)
fixup! Use fmt for conversions from number to string (instead of raw_convert).
Diffstat (limited to 'src')
-rw-r--r--src/text_asset_internal.cc18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/text_asset_internal.cc b/src/text_asset_internal.cc
index e7e5d0fa..21bd4018 100644
--- a/src/text_asset_internal.cc
+++ b/src/text_asset_internal.cc
@@ -177,9 +177,9 @@ position_align (xmlpp::Element* e, order::Context& context, HAlign h_align, floa
if (fabs(h_position) > ALIGN_EPSILON) {
if (context.standard == Standard::SMPTE) {
- e->set_attribute("Hposition", fmt::format("{:.6f}", h_position * 100));
+ e->set_attribute("Hposition", fmt::format("{:.6}", h_position * 100));
} else {
- e->set_attribute("HPosition", fmt::format("{:.6f}", h_position * 100));
+ e->set_attribute("HPosition", fmt::format("{:.6}", h_position * 100));
}
}
@@ -191,9 +191,9 @@ position_align (xmlpp::Element* e, order::Context& context, HAlign h_align, floa
if (fabs(v_position) > ALIGN_EPSILON) {
if (context.standard == Standard::SMPTE) {
- e->set_attribute("Vposition", fmt::format("{:.6f}", v_position * 100));
+ e->set_attribute("Vposition", fmt::format("{:.6}", v_position * 100));
} else {
- e->set_attribute("VPosition", fmt::format("{:.6f}", v_position * 100, 6));
+ e->set_attribute("VPosition", fmt::format("{:.6}", v_position * 100, 6));
}
} else {
if (context.standard == Standard::SMPTE) {
@@ -204,7 +204,7 @@ position_align (xmlpp::Element* e, order::Context& context, HAlign h_align, floa
}
if (fabs(z_position) > ALIGN_EPSILON && context.standard == Standard::SMPTE) {
- e->set_attribute("Zposition", fmt::format("{:.6f}", z_position * 100));
+ e->set_attribute("Zposition", fmt::format("{:.6}", z_position * 100));
}
}
@@ -228,11 +228,11 @@ order::Text::as_xml (xmlpp::Element* parent, Context& context) const
cxml::add_child(xml, "Rb")->add_child_text(ruby.base);
auto rt = cxml::add_child(xml, "Rt");
rt->add_child_text(ruby.annotation);
- rt->set_attribute("Size", fmt::format("{:.6f}", ruby.size));
+ rt->set_attribute("Size", fmt::format("{:.6}", ruby.size));
rt->set_attribute("Position", ruby.position == RubyPosition::BEFORE ? "before" : "after");
- rt->set_attribute("Offset", fmt::format("{:.6f}", ruby.offset));
- rt->set_attribute("Spacing", fmt::format("{:.6f}", ruby.spacing));
- rt->set_attribute("AspectAdjust", fmt::format("{:.6f}", ruby.aspect_adjust));
+ rt->set_attribute("Offset", fmt::format("{:.6}", ruby.offset));
+ rt->set_attribute("Spacing", fmt::format("{:.6}", ruby.spacing));
+ rt->set_attribute("AspectAdjust", fmt::format("{:.6}", ruby.aspect_adjust));
}
return e;