diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-01-24 23:00:36 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-01-24 23:00:36 +0100 |
| commit | 0d7e66baa9a6def5b333906d1f094f7ad78b0726 (patch) | |
| tree | b2b3839909c080648aaf338a075b40ec9938280e /src | |
| parent | e1e7de8d73bedd0c741e7df0390068c67867e09f (diff) | |
Fix previous.
Diffstat (limited to 'src')
| -rw-r--r-- | src/subtitle_string.cc | 2 | ||||
| -rw-r--r-- | src/types.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/subtitle_string.cc b/src/subtitle_string.cc index 28c02114..acd35691 100644 --- a/src/subtitle_string.cc +++ b/src/subtitle_string.cc @@ -84,7 +84,7 @@ SubtitleString::SubtitleString ( , _effect (effect) , _effect_colour (effect_colour) { - _aspect_adjust = max(min(_aspect_adjust, 4.0), 0.25); + _aspect_adjust = max(min(_aspect_adjust, 4.0f), 0.25f); } diff --git a/src/types.cc b/src/types.cc index f22bfa91..b4c10ddc 100644 --- a/src/types.cc +++ b/src/types.cc @@ -484,8 +484,8 @@ ContentVersion::as_xml (xmlpp::Element* parent) const Luminance::Luminance (cxml::ConstNodePtr node) - : _unit(string_to_unit(node->string_attribute("units"))) - , _value(raw_convert<float>(node->content())) + : _value(raw_convert<float>(node->content())) + , _unit(string_to_unit(node->string_attribute("units"))) { } |