diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-05-12 00:57:51 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-05-12 00:57:51 +0100 |
| commit | df085fc0ea4f1a3f009de5a7a5bf9f241173bcba (patch) | |
| tree | 597ff1fe90446aa684e5fede3a72217b0b5c3d1a /src/lib/subtitle_content.cc | |
| parent | 1b576d63f5b5babda35c3995dd375e39baa16947 (diff) | |
Remove LocaleGuard and lexical_cast<> in favour of libdcp::raw_convert,
which should get things right with both decimal and thousands
separators; LocaleGuard fixed decimal separators ok but not, it appears,
thousands ones.
Diffstat (limited to 'src/lib/subtitle_content.cc')
| -rw-r--r-- | src/lib/subtitle_content.cc | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/lib/subtitle_content.cc b/src/lib/subtitle_content.cc index 8f88574e5..0abb7d491 100644 --- a/src/lib/subtitle_content.cc +++ b/src/lib/subtitle_content.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013 Carl Hetherington <cth@carlh.net> + Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,6 +18,7 @@ */ #include <libcxml/cxml.h> +#include <libdcp/raw_convert.h> #include "subtitle_content.h" #include "util.h" #include "exceptions.h" @@ -27,8 +28,8 @@ using std::string; using std::vector; using boost::shared_ptr; -using boost::lexical_cast; using boost::dynamic_pointer_cast; +using libdcp::raw_convert; int const SubtitleContentProperty::SUBTITLE_X_OFFSET = 500; int const SubtitleContentProperty::SUBTITLE_Y_OFFSET = 501; @@ -49,8 +50,6 @@ SubtitleContent::SubtitleContent (shared_ptr<const Film> f, shared_ptr<const cxm , _subtitle_y_offset (0) , _subtitle_scale (1) { - LocaleGuard lg; - if (version >= 7) { _subtitle_x_offset = node->number_child<float> ("SubtitleXOffset"); _subtitle_y_offset = node->number_child<float> ("SubtitleYOffset"); @@ -91,11 +90,9 @@ SubtitleContent::SubtitleContent (shared_ptr<const Film> f, vector<shared_ptr<Co void SubtitleContent::as_xml (xmlpp::Node* root) const { - LocaleGuard lg; - - root->add_child("SubtitleXOffset")->add_child_text (lexical_cast<string> (_subtitle_x_offset)); - root->add_child("SubtitleYOffset")->add_child_text (lexical_cast<string> (_subtitle_y_offset)); - root->add_child("SubtitleScale")->add_child_text (lexical_cast<string> (_subtitle_scale)); + root->add_child("SubtitleXOffset")->add_child_text (raw_convert<string> (_subtitle_x_offset)); + root->add_child("SubtitleYOffset")->add_child_text (raw_convert<string> (_subtitle_y_offset)); + root->add_child("SubtitleScale")->add_child_text (raw_convert<string> (_subtitle_scale)); } void |