From: Carl Hetherington <cth@carlh.net>
Date: Sun, 24 Jan 2021 22:00:36 +0000 (+0100)
Subject: Fix previous.
X-Git-Tag: v1.8.0~113
X-Git-Url: https://main.carlh.net/gitweb/?p=libdcp.git;a=commitdiff_plain;h=0d7e66baa9a6def5b333906d1f094f7ad78b0726

Fix previous.
---

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