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

diff --git a/ChangeLog b/ChangeLog
index 9a17f1e8d9d08e4126e4eac56ef9a2beb7fa57da..81d5be230ac410d785fc1734f8c8c812e15df4f8 100644 (file)
--- 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 838fdcae2b570c3bdd594f95ca131bc40878f21f..fc295aa0185556092d769110b07bfedbe36c1e86 100644 (file)
--- 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 6603e21e68b2e13ef0c35c073c925feda928eec6..0625f059b21089924fd5d543914948c62d07c09c 100644 (file)
--- 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 d779a764299f39f99c32afe0759267b56c7d1865..48c9e9cf6c8fb673df9f8b94582be870ba3d896c 100644 (file)
--- 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 ("");