Add locale_convert. Reimplement raw_convert without stringstream.

5 files changed, 475 insertions, 12 deletions

diff --git a/src/locale_convert.cc b/src/locale_convert.cc
new file mode 100644
index 00000000..549a1041
--- /dev/null
+++ b/src/locale_convert.cc
@@ -0,0 +1,152 @@
+/*
+    Copyright (C) 2016 Carl Hetherington <cth@carlh.net>
+
+    This file is part of libdcp.
+
+    libdcp is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    libdcp is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of portions of this program with the
+    OpenSSL library under certain conditions as described in each
+    individual source file, and distribute linked combinations
+    including the two.
+
+    You must obey the GNU General Public License in all respects
+    for all of the code used other than OpenSSL.  If you modify
+    file(s) with this exception, you may extend this exception to your
+    version of the file(s), but you are not obligated to do so.  If you
+    do not wish to do so, delete this exception statement from your
+    version.  If you delete this exception statement from all source
+    files in the program, then also delete it here.
+*/
+
+#include "locale_convert.h"
+#include <string>
+#include <inttypes.h>
+
+using std::string;
+
+template<>
+string
+dcp::locale_convert (int x, int, bool)
+{
+	char buffer[64];
+	snprintf (buffer, sizeof(buffer), "%d", x);
+	return buffer;
+}
+
+template<>
+string
+dcp::locale_convert (int64_t x, int, bool)
+{
+	char buffer[64];
+	snprintf (buffer, sizeof(buffer), "%" PRId64, x);
+	return buffer;
+}
+
+template<>
+string
+dcp::locale_convert (uint64_t x, int, bool)
+{
+	char buffer[64];
+	snprintf (buffer, sizeof(buffer), "%" PRIu64, x);
+	return buffer;
+}
+
+template<>
+string
+dcp::locale_convert (float x, int precision, bool fixed)
+{
+	char format[64];
+	if (fixed) {
+		snprintf (format, sizeof(format), "%%.%df", precision);
+	} else {
+		snprintf (format, sizeof(format), "%%.%dg", precision);
+	}
+	char buffer[64];
+	snprintf (buffer, sizeof(buffer), format, x);
+	return buffer;
+}
+
+template<>
+string
+dcp::locale_convert (double x, int precision, bool fixed)
+{
+	char format[64];
+	if (fixed) {
+		snprintf (format, sizeof(format), "%%.%df", precision);
+	} else {
+		snprintf (format, sizeof(format), "%%.%dg", precision);
+	}
+	char buffer[64];
+	snprintf (buffer, sizeof(buffer), format, x);
+	return buffer;
+}
+
+template<>
+string
+dcp::locale_convert (string x, int, bool)
+{
+	return x;
+}
+
+template<>
+string
+dcp::locale_convert (char* x, int, bool)
+{
+	return x;
+}
+
+template<>
+string
+dcp::locale_convert (char const * x, int, bool)
+{
+	return x;
+}
+
+template<>
+int
+dcp::locale_convert (string x, int, bool)
+{
+	int y = 0;
+	sscanf (x.c_str(), "%d", &y);
+	return y;
+}
+
+template<>
+int64_t
+dcp::locale_convert (string x, int, bool)
+{
+	int64_t y = 0;
+	sscanf (x.c_str(), "%" PRId64, &y);
+	return y;
+}
+
+template<>
+float
+dcp::locale_convert (string x, int, bool)
+{
+	float y = 0;
+	sscanf (x.c_str(), "%f", &y);
+	return y;
+}
+
+template<>
+double
+dcp::locale_convert (string x, int, bool)
+{
+	double y = 0;
+	sscanf (x.c_str(), "%lf", &y);
+	return y;
+}
diff --git a/src/locale_convert.h b/src/locale_convert.h
new file mode 100644
index 00000000..1b6ea42f
--- /dev/null
+++ b/src/locale_convert.h
@@ -0,0 +1,102 @@
+/*
+    Copyright (C) 2016 Carl Hetherington <cth@carlh.net>
+
+    This file is part of libdcp.
+
+    libdcp is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    libdcp is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of portions of this program with the
+    OpenSSL library under certain conditions as described in each
+    individual source file, and distribute linked combinations
+    including the two.
+
+    You must obey the GNU General Public License in all respects
+    for all of the code used other than OpenSSL.  If you modify
+    file(s) with this exception, you may extend this exception to your
+    version of the file(s), but you are not obligated to do so.  If you
+    do not wish to do so, delete this exception statement from your
+    version.  If you delete this exception statement from all source
+    files in the program, then also delete it here.
+*/
+
+#ifndef LIBDCP_LOCALE_CONVERT_H
+#define LIBDCP_LOCALE_CONVERT_H
+
+#include <boost/static_assert.hpp>
+#include <string>
+
+namespace dcp {
+
+template <typename P, typename Q>
+P
+locale_convert (Q x, int precision = 16, bool fixed = false)
+{
+	/* We can't write a generic version of locale_convert; all required
+	   versions must be specialised.
+	*/
+	BOOST_STATIC_ASSERT (sizeof (Q) == 0);
+}
+
+template <>
+std::string
+locale_convert (int x, int, bool);
+
+template <>
+std::string
+locale_convert (int64_t x, int, bool);
+
+template <>
+std::string
+locale_convert (uint64_t x, int, bool);
+
+template <>
+std::string
+locale_convert (float x, int precision, bool fixed);
+
+template <>
+std::string
+locale_convert (double x, int precision, bool fixed);
+
+template <>
+std::string
+locale_convert (std::string x, int, bool);
+
+template <>
+std::string
+locale_convert (char* x, int, bool);
+
+template <>
+std::string
+locale_convert (char const * x, int, bool);
+
+template <>
+int
+locale_convert (std::string x, int, bool);
+
+template <>
+int64_t
+locale_convert (std::string x, int, bool);
+
+template <>
+float
+locale_convert (std::string x, int, bool);
+
+template <>
+double
+locale_convert (std::string x, int, bool);
+
+}
+
+#endif
diff --git a/src/raw_convert.cc b/src/raw_convert.cc
new file mode 100644
index 00000000..cb7807a3
--- /dev/null
+++ b/src/raw_convert.cc
@@ -0,0 +1,156 @@
+/*
+    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+
+    This file is part of libdcp.
+
+    libdcp is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    libdcp is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of portions of this program with the
+    OpenSSL library under certain conditions as described in each
+    individual source file, and distribute linked combinations
+    including the two.
+
+    You must obey the GNU General Public License in all respects
+    for all of the code used other than OpenSSL.  If you modify
+    file(s) with this exception, you may extend this exception to your
+    version of the file(s), but you are not obligated to do so.  If you
+    do not wish to do so, delete this exception statement from your
+    version.  If you delete this exception statement from all source
+    files in the program, then also delete it here.
+*/
+
+#include "raw_convert.h"
+#include "locale_convert.h"
+#include <boost/algorithm/string.hpp>
+
+using std::string;
+
+static
+string
+make_raw (string v)
+{
+	struct lconv* lc = localeconv ();
+	boost::algorithm::replace_all (v, lc->decimal_point, ".");
+	boost::algorithm::replace_all (v, lc->thousands_sep, "");
+	return v;
+}
+
+static
+string
+make_local (string v)
+{
+	struct lconv* lc = localeconv ();
+	boost::algorithm::replace_all (v, ".", lc->decimal_point);
+	/* We hope it's ok not to add in thousands separators here */
+	return v;
+}
+
+template <>
+string
+dcp::raw_convert (int v, int precision, bool fixed)
+{
+	return make_raw (locale_convert<string> (v, precision, fixed));
+}
+
+template <>
+string
+dcp::raw_convert (int64_t v, int precision, bool fixed)
+{
+	return make_raw (locale_convert<string> (v, precision, fixed));
+}
+
+template <>
+string
+dcp::raw_convert (uint64_t v, int precision, bool fixed)
+{
+	return make_raw (locale_convert<string> (v, precision, fixed));
+}
+
+template <>
+string
+dcp::raw_convert (float v, int precision, bool fixed)
+{
+	return make_raw (locale_convert<string> (v, precision, fixed));
+}
+
+template <>
+string
+dcp::raw_convert (double v, int precision, bool fixed)
+{
+	return make_raw (locale_convert<string> (v, precision, fixed));
+}
+
+template <>
+string
+dcp::raw_convert (char const * v, int, bool)
+{
+	return v;
+}
+
+template <>
+string
+dcp::raw_convert (char* v, int, bool)
+{
+	return v;
+}
+
+template <>
+string
+dcp::raw_convert (string v, int, bool)
+{
+	return v;
+}
+
+template <>
+int
+dcp::raw_convert (string v, int precision, bool fixed)
+{
+	return locale_convert<int> (make_local (v), precision, fixed);
+}
+
+template <>
+int
+dcp::raw_convert (char const * v, int precision, bool fixed)
+{
+	return locale_convert<int> (make_local (v), precision, fixed);
+}
+
+template <>
+float
+dcp::raw_convert (string v, int precision, bool fixed)
+{
+	return locale_convert<float> (make_local (v), precision, fixed);
+}
+
+template <>
+float
+dcp::raw_convert (char const * v, int precision, bool fixed)
+{
+	return locale_convert<float> (make_local (v), precision, fixed);
+}
+
+template <>
+double
+dcp::raw_convert (string v, int precision, bool fixed)
+{
+	return locale_convert<double> (make_local (v), precision, fixed);
+}
+
+template <>
+double
+dcp::raw_convert (char const * v, int precision, bool fixed)
+{
+	return locale_convert<double> (make_local (v), precision, fixed);
+}
diff --git a/src/raw_convert.h b/src/raw_convert.h
index 5fc05c12..b2b206b3 100644
--- a/src/raw_convert.h
+++ b/src/raw_convert.h
@@ -34,7 +34,7 @@
 #ifndef LIBDCP_RAW_CONVERT_H
 #define LIBDCP_RAW_CONVERT_H
 
-#include <locked_sstream.h>
+#include <boost/static_assert.hpp>
 #include <iomanip>
 
 namespace dcp {
@@ -46,18 +46,68 @@ template <typename P, typename Q>
 P
 raw_convert (Q v, int precision = 16, bool fixed = false)
 {
-	locked_stringstream s;
-	s.imbue (std::locale::classic ());
-	s << std::setprecision (precision);
-	if (fixed) {
-		s << std::fixed;
-	}
-	s << v;
-	P r;
-	s >> r;
-	return r;
+	/* We can't write a generic version of raw_convert; all required
+	   versions must be specialised.
+	*/
+	BOOST_STATIC_ASSERT (sizeof (Q) == 0);
 }
 
-};
+template <>
+std::string
+raw_convert (int v, int, bool);
+
+template <>
+std::string
+raw_convert (int64_t v, int, bool);
+
+template <>
+std::string
+raw_convert (uint64_t v, int, bool);
+
+template <>
+std::string
+raw_convert (float v, int, bool);
+
+template <>
+std::string
+raw_convert (double v, int, bool);
+
+template <>
+std::string
+raw_convert (char const * v, int, bool);
+
+template <>
+std::string
+raw_convert (char* v, int, bool);
+
+template <>
+std::string
+raw_convert (std::string v, int, bool);
+
+template <>
+int
+raw_convert (std::string v, int, bool);
+
+template <>
+int
+raw_convert (char const * v, int, bool);
+
+template <>
+float
+raw_convert (std::string v, int, bool);
+
+template <>
+float
+raw_convert (char const * v, int, bool);
+
+template <>
+double
+raw_convert (std::string v, int, bool);
+
+template <>
+double
+raw_convert (char const * v, int, bool);
+
+}
 
 #endif
diff --git a/src/wscript b/src/wscript
index 9430aeca..247f4626 100644
--- a/src/wscript
+++ b/src/wscript
@@ -59,6 +59,7 @@ def build(bld):
              j2k.cc
              key.cc
              local_time.cc
+             locale_convert.cc
              metadata.cc
              modified_gamma_transfer_function.cc
              mono_picture_asset.cc
@@ -71,6 +72,7 @@ def build(bld):
              openjpeg_image.cc
              picture_asset.cc
              picture_asset_writer.cc
+             raw_convert.cc
              reel.cc
              reel_asset.cc
              reel_atmos_asset.cc
@@ -128,6 +130,7 @@ def build(bld):
               key.h
               load_font_node.h
               local_time.h
+              locale_convert.h
               metadata.h
               mono_picture_asset.h
               mono_picture_asset_reader.h