summaryrefslogtreecommitdiff
path: root/src/lib/subtitle_content.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-11-10 00:01:17 +0000
committerCarl Hetherington <cth@carlh.net>2015-11-10 00:01:17 +0000
commitc898fa989be0e0a3e09367ace693fac8c3120ad2 (patch)
tree0ec950a093cd4c628e079ffcc4a0126434980189 /src/lib/subtitle_content.cc
parentde2baccfb235ccf2f160614ea2565d6dfd00ebe0 (diff)
Fix some float/double implicit casts (#742).
Diffstat (limited to 'src/lib/subtitle_content.cc')
-rw-r--r--src/lib/subtitle_content.cc12
1 files changed, 6 insertions, 6 deletions
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 ("");