Tidying.

[libdcp.git] / src / locale_convert.cc

diff --git a/src/locale_convert.cc b/src/locale_convert.cc
index 549a104172903135bb94e4e3db0e57cb42e0f1cf..2c7c74eff57241021bd8d50a049075c2fb8b8ce1 100644 (file)
--- a/src/locale_convert.cc
+++ b/src/locale_convert.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2016-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
@@ -31,11 +31,40 @@
     files in the program, then also delete it here.
 */
 
+
+/** @file  src/locale_convert.cc
+ *  @brief Methods to convert to/from string using the current locale
+ */
+
+
 #include "locale_convert.h"
 #include <string>
 #include <inttypes.h>
 
+
 using std::string;
+using std::wstring;
+
+
+template<>
+string
+dcp::locale_convert (unsigned char x, int, bool)
+{
+       char buffer[64];
+       snprintf (buffer, sizeof(buffer), "%hhd", x);
+       return buffer;
+}
+
+
+template<>
+string
+dcp::locale_convert (unsigned short int x, int, bool)
+{
+       char buffer[64];
+       snprintf (buffer, sizeof(buffer), "%hd", x);
+       return buffer;
+}
+
 
 template<>
 string
@@ -46,24 +75,69 @@ dcp::locale_convert (int x, int, bool)
        return buffer;
 }
 
+
+template<>
+string
+dcp::locale_convert (unsigned int x, int, bool)
+{
+       char buffer[64];
+       snprintf (buffer, sizeof(buffer), "%u", x);
+       return buffer;
+}
+
+
 template<>
 string
-dcp::locale_convert (int64_t x, int, bool)
+dcp::locale_convert (long int x, int, bool)
 {
        char buffer[64];
-       snprintf (buffer, sizeof(buffer), "%" PRId64, x);
+#ifdef LIBDCP_WINDOWS
+       __mingw_snprintf (buffer, sizeof(buffer), "%ld", x);
+#else
+       snprintf (buffer, sizeof(buffer), "%ld", x);
+#endif
        return buffer;
 }
 
+
 template<>
 string
-dcp::locale_convert (uint64_t x, int, bool)
+dcp::locale_convert (unsigned long int x, int, bool)
 {
        char buffer[64];
-       snprintf (buffer, sizeof(buffer), "%" PRIu64, x);
+       snprintf (buffer, sizeof(buffer), "%lu", x);
        return buffer;
 }
 
+
+template<>
+string
+dcp::locale_convert (long long int x, int, bool)
+{
+       char buffer[64];
+#ifdef LIBDCP_WINDOWS
+       __mingw_snprintf (buffer, sizeof(buffer), "%lld", x);
+#else
+       snprintf (buffer, sizeof(buffer), "%lld", x);
+#endif
+       return buffer;
+}
+
+
+template<>
+string
+dcp::locale_convert (unsigned long long int x, int, bool)
+{
+       char buffer[64];
+#ifdef LIBDCP_WINDOWS
+       __mingw_snprintf (buffer, sizeof(buffer), "%llu", x);
+#else
+       snprintf (buffer, sizeof(buffer), "%llu", x);
+#endif
+       return buffer;
+}
+
+
 template<>
 string
 dcp::locale_convert (float x, int precision, bool fixed)
@@ -79,6 +153,7 @@ dcp::locale_convert (float x, int precision, bool fixed)
        return buffer;
 }
 
+
 template<>
 string
 dcp::locale_convert (double x, int precision, bool fixed)
@@ -94,6 +169,7 @@ dcp::locale_convert (double x, int precision, bool fixed)
        return buffer;
 }
 
+
 template<>
 string
 dcp::locale_convert (string x, int, bool)
@@ -101,6 +177,7 @@ dcp::locale_convert (string x, int, bool)
        return x;
 }
 
+
 template<>
 string
 dcp::locale_convert (char* x, int, bool)
@@ -108,6 +185,7 @@ dcp::locale_convert (char* x, int, bool)
        return x;
 }
 
+
 template<>
 string
 dcp::locale_convert (char const * x, int, bool)
@@ -115,6 +193,64 @@ dcp::locale_convert (char const * x, int, bool)
        return x;
 }
 
+
+template<>
+string
+dcp::locale_convert (wchar_t const * x, int, bool)
+{
+       wstring s (x);
+       return string (s.begin(), s.end());
+}
+
+
+template<>
+string
+dcp::locale_convert (char x, int, bool)
+{
+       string s;
+       s += x;
+       return s;
+}
+
+
+template<>
+string
+dcp::locale_convert (boost::filesystem::path x, int, bool)
+{
+       return x.string();
+}
+
+
+template<>
+unsigned char
+dcp::locale_convert (string x, int, bool)
+{
+       unsigned char y = 0;
+       sscanf (x.c_str(), "%hhu", &y);
+       return y;
+}
+
+
+template<>
+unsigned short int
+dcp::locale_convert (string x, int, bool)
+{
+       unsigned short int y = 0;
+       sscanf (x.c_str(), "%hu", &y);
+       return y;
+}
+
+
+template<>
+unsigned int
+dcp::locale_convert (string x, int, bool)
+{
+       unsigned int y = 0;
+       sscanf (x.c_str(), "%u", &y);
+       return y;
+}
+
+
 template<>
 int
 dcp::locale_convert (string x, int, bool)
@@ -124,15 +260,59 @@ dcp::locale_convert (string x, int, bool)
        return y;
 }
 
+
 template<>
-int64_t
+long
 dcp::locale_convert (string x, int, bool)
 {
-       int64_t y = 0;
-       sscanf (x.c_str(), "%" PRId64, &y);
+       long int y = 0;
+       sscanf (x.c_str(), "%ld", &y);
        return y;
 }
 
+
+template<>
+unsigned long
+dcp::locale_convert (string x, int, bool)
+{
+       unsigned long y = 0;
+#ifdef LIBDCP_WINDOWS
+       __mingw_sscanf (x.c_str(), "%lud", &y);
+#else
+       sscanf (x.c_str(), "%lud", &y);
+#endif
+       return y;
+}
+
+
+template<>
+long long
+dcp::locale_convert (string x, int, bool)
+{
+       long long y = 0;
+#ifdef LIBDCP_WINDOWS
+       __mingw_sscanf (x.c_str(), "%lld", &y);
+#else
+       sscanf (x.c_str(), "%lld", &y);
+#endif
+       return y;
+}
+
+
+template<>
+unsigned long long
+dcp::locale_convert (string x, int, bool)
+{
+       unsigned long long y = 0;
+#ifdef LIBDCP_WINDOWS
+       __mingw_sscanf (x.c_str(), "%llud", &y);
+#else
+       sscanf (x.c_str(), "%llud", &y);
+#endif
+       return y;
+}
+
+
 template<>
 float
 dcp::locale_convert (string x, int, bool)
@@ -142,6 +322,7 @@ dcp::locale_convert (string x, int, bool)
        return y;
 }
 
+
 template<>
 double
 dcp::locale_convert (string x, int, bool)