diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-11-10 00:01:17 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-11-10 00:01:17 +0000 |
| commit | c898fa989be0e0a3e09367ace693fac8c3120ad2 (patch) | |
| tree | 0ec950a093cd4c628e079ffcc4a0126434980189 /src | |
| parent | de2baccfb235ccf2f160614ea2565d6dfd00ebe0 (diff) | |
Fix some float/double implicit casts (#742).
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/audio_content.cc | 2 | ||||
| -rw-r--r-- | src/lib/colour_conversion.cc | 4 | ||||
| -rw-r--r-- | src/lib/subtitle_content.cc | 12 |
3 files changed, 9 insertions, 9 deletions
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 (""); |