X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fraw_convert.h;h=c7b04823732ed342c1f80eaf8ed0cbf5871b8bc8;hb=4fa8274be83aeaa0c9503a778b2b17f673570723;hp=507af15223c49e5887b10b2bfa6b7c0bdfd66c1f;hpb=470ca64f19d38ef377ec08f03f5ad3b88b370003;p=libdcp.git

diff --git a/src/raw_convert.h b/src/raw_convert.h
index 507af152..c7b04823 100644
--- a/src/raw_convert.h
+++ b/src/raw_convert.h
@@ -1,39 +1,161 @@
 /*
     Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    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.
 
-    This program is distributed in the hope that it will be useful,
+    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 this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    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 <sstream>
+#ifndef LIBDCP_RAW_CONVERT_H
+#define LIBDCP_RAW_CONVERT_H
 
-namespace libdcp {
+#include <boost/static_assert.hpp>
+#include <iomanip>
+
+namespace dcp {
 
 /** A sort-of version of boost::lexical_cast that does uses the "C"
  *  locale (i.e. no thousands separators and a . for the decimal separator).
  */
 template <typename P, typename Q>
 P
-raw_convert (Q v)
+raw_convert (Q v, int precision = 16, bool fixed = false)
 {
-	std::stringstream s;
-	s.imbue (std::locale::classic ());
-	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 (unsigned char v, int, bool);
+
+template <>
+std::string
+raw_convert (unsigned short int v, int, bool);
+
+template <>
+std::string
+raw_convert (int v, int, bool);
+
+template <>
+std::string
+raw_convert (unsigned int v, int, bool);
+
+template <>
+std::string
+raw_convert (long v, int, bool);
+
+template <>
+std::string
+raw_convert (unsigned long v, int, bool);
+
+template <>
+std::string
+raw_convert (long long v, int, bool);
+
+template <>
+std::string
+raw_convert (unsigned long long 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 <>
+std::string
+raw_convert (wchar_t const * v, int, bool);
+
+template <>
+std::string
+raw_convert (char v, int, bool);
+
+template <>
+unsigned char
+raw_convert (std::string v, int, bool);
+
+template <>
+unsigned short int
+raw_convert (std::string v, int, bool);
+
+template <>
+int
+raw_convert (std::string v, int, bool);
+
+template <>
+long
+raw_convert (std::string v, int, bool);
+
+template <>
+unsigned long
+raw_convert (std::string v, int, bool);
+
+template <>
+long long
+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