diff options
| -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"))) { } |