From: Carl Hetherington <cth@carlh.net>
Date: Tue, 10 Nov 2015 00:01:17 +0000 (+0000)
Subject: Fix some float/double implicit casts (#742).
X-Git-Tag: v2.5.1~3
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=c898fa989be0e0a3e09367ace693fac8c3120ad2

Fix some float/double implicit casts (#742).
---

diff --git a/ChangeLog b/ChangeLog
index 9a17f1e8d..81d5be230 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2015-11-09  Carl Hetherington  <cth@carlh.net>
 
+	* Correct a number of float/double mismatches; should fix #742.
+
 	* Desensitise trim-playhead buttons as appropriate (#737).
 
 	* Keep same frame visible after trimming content start (#737).
diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc
index 838fdcae2..fc295aa01 100644
--- a/src/lib/audio_content.cc
+++ b/src/lib/audio_content.cc
@@ -73,7 +73,7 @@ AudioContent::AudioContent (shared_ptr<const Film> film, boost::filesystem::path
 AudioContent::AudioContent (shared_ptr<const Film> film, cxml::ConstNodePtr node)
 	: Content (film, node)
 {
-	_audio_gain = node->number_child<float> ("AudioGain");
+	_audio_gain = node->number_child<double> ("AudioGain");
 	_audio_delay = node->number_child<int> ("AudioDelay");
 }
 
diff --git a/src/lib/colour_conversion.cc b/src/lib/colour_conversion.cc
index 6603e21e6..0625f059b 100644
--- a/src/lib/colour_conversion.cc
+++ b/src/lib/colour_conversion.cc
@@ -81,9 +81,9 @@ ColourConversion::ColourConversion (cxml::NodePtr node, int version)
 		/* Version 1.x */
 
 		if (node->bool_child ("InputGammaLinearised")) {
-			_in.reset (new dcp::ModifiedGammaTransferFunction (node->number_child<float> ("InputGamma"), 0.04045, 0.055, 12.92));
+			_in.reset (new dcp::ModifiedGammaTransferFunction (node->number_child<double> ("InputGamma"), 0.04045, 0.055, 12.92));
 		} else {
-			_in.reset (new dcp::GammaTransferFunction (node->number_child<float> ("InputGamma")));
+			_in.reset (new dcp::GammaTransferFunction (node->number_child<double> ("InputGamma")));
 		}
 	}
 
diff --git a/src/lib/subtitle_content.cc b/src/lib/subtitle_content.cc
index d779a7642..48c9e9cf6 100644
--- a/src/lib/subtitle_content.cc
+++ b/src/lib/subtitle_content.cc
@@ -86,17 +86,17 @@ SubtitleContent::SubtitleContent (shared_ptr<const Film> film, cxml::ConstNodePt
 	}
 
 	if (version >= 7) {
-		_subtitle_x_offset = node->number_child<float> ("SubtitleXOffset");
-		_subtitle_y_offset = node->number_child<float> ("SubtitleYOffset");
+		_subtitle_x_offset = node->number_child<double> ("SubtitleXOffset");
+		_subtitle_y_offset = node->number_child<double> ("SubtitleYOffset");
 	} else {
-		_subtitle_y_offset = node->number_child<float> ("SubtitleOffset");
+		_subtitle_y_offset = node->number_child<double> ("SubtitleOffset");
 	}
 
 	if (version >= 10) {
-		_subtitle_x_scale = node->number_child<float> ("SubtitleXScale");
-		_subtitle_y_scale = node->number_child<float> ("SubtitleYScale");
+		_subtitle_x_scale = node->number_child<double> ("SubtitleXScale");
+		_subtitle_y_scale = node->number_child<double> ("SubtitleYScale");
 	} else {
-		_subtitle_x_scale = _subtitle_y_scale = node->number_child<float> ("SubtitleScale");
+		_subtitle_x_scale = _subtitle_y_scale = node->number_child<double> ("SubtitleScale");
 	}
 
 	_subtitle_language = node->optional_string_child ("SubtitleLanguage").get_value_or ("");