More licence fixups.

[libdcp.git] / src / raw_convert.h

diff --git a/src/raw_convert.h b/src/raw_convert.h
index 37cddbf07cfd26db5e6275434fdaa04727915e93..36ff0bcfae220ba0697bc50a2b157f8bdc142c0a 100644 (file)
--- a/src/raw_convert.h
+++ b/src/raw_convert.h
@@ -1,22 +1,25 @@
 /*
     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/>.
 */
 
+#ifndef LIBDCP_RAW_CONVERT_H
+#define LIBDCP_RAW_CONVERT_H
+
 #include <sstream>
 #include <iomanip>
 
@@ -27,11 +30,14 @@ namespace dcp {
  */
 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 << std::setprecision (16);
+       s << std::setprecision (precision);
+       if (fixed) {
+               s << std::fixed;
+       }
        s << v;
        P r;
        s >> r;
@@ -39,3 +45,5 @@ raw_convert (Q v)
 }
 
 };
+
+#endif