Use an enum class for Marker.

[libdcp.git] / src / locale_convert.cc

diff --git a/src/locale_convert.cc b/src/locale_convert.cc
index 0f0b5fa2311bda699d23e94ad92e17793d7710f3..915cac826bbe58387977ed1c355c1a5243ed8985 100644 (file)
--- a/src/locale_convert.cc
+++ b/src/locale_convert.cc
@@ -197,6 +197,33 @@ 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)
@@ -215,6 +242,19 @@ dcp::locale_convert (string x, int, bool)
        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)
@@ -228,6 +268,19 @@ dcp::locale_convert (string x, int, bool)
        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)