Fix missing version string when Popen communicate returns byte strings.

[libdcp.git] / src / raw_convert.h

diff --git a/src/raw_convert.h b/src/raw_convert.h
index 36ff0bcfae220ba0697bc50a2b157f8bdc142c0a..af2a1e37db5ec2fc400674a7e2d9102fcc658315 100644 (file)
--- a/src/raw_convert.h
+++ b/src/raw_convert.h
@@ -15,12 +15,26 @@
 
     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_RAW_CONVERT_H
 #define LIBDCP_RAW_CONVERT_H
 
-#include <sstream>
+#include <boost/static_assert.hpp>
 #include <iomanip>
 
 namespace dcp {
@@ -32,18 +46,96 @@ template <typename P, typename Q>
 P
 raw_convert (Q v, int precision = 16, bool fixed = false)
 {
-       std::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 (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 <>
+int
+raw_convert (std::string v, int, bool);
+
+template <>
+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