Fix previous.

diff --git a/src/subtitle_string.cc b/src/subtitle_string.cc
index 28c02114ceb749fbdc9dbc4a2579bdb6f3093e91..acd35691f46f40a81a400813946162a0e7981a25 100644 (file)
--- a/src/subtitle_string.cc
+++ b/src/subtitle_string.cc
@@ -84,7 +84,7 @@ SubtitleString::SubtitleString (
        , _effect (effect)
        , _effect_colour (effect_colour)
 {
        , _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 f22bfa911a1a9786e6ac260180c7722690f8f024..b4c10ddc35ba14c33c73338dbce7c29a47d0f432 100644 (file)
--- a/src/types.cc
+++ b/src/types.cc
@@ -484,8 +484,8 @@ ContentVersion::as_xml (xmlpp::Element* parent) const
 
 
 Luminance::Luminance (cxml::ConstNodePtr node)
 
 
 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")))

 {
 
 }
 {
 
 }