Missing initialisattion of DCPReadError::_message.

[libdcp.git] / src / types.cc

diff --git a/src/types.cc b/src/types.cc
index 30c565c90813af1ba5307bfce1af7a06ee11e4fc..a7c621ffc688d02b6841a2e6ffa851ae572c004a 100644 (file)
--- a/src/types.cc
+++ b/src/types.cc
@@ -1,20 +1,34 @@
 /*
     Copyright (C) 2012-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 "raw_convert.h"
@@ -30,6 +44,22 @@ using namespace std;
 using namespace dcp;
 using namespace boost;
 
+bool dcp::operator== (dcp::Size const & a, dcp::Size const & b)
+{
+       return (a.width == b.width && a.height == b.height);
+}
+
+bool dcp::operator!= (dcp::Size const & a, dcp::Size const & b)
+{
+       return !(a == b);
+}
+
+ostream& dcp::operator<< (ostream& s, dcp::Size const & a)
+{
+       s << a.width << "x" << a.height;
+       return s;
+}
+
 /** Construct a Fraction from a string of the form <numerator> <denominator>
  *  e.g. "1 3".
  */
@@ -107,16 +137,20 @@ Colour::Colour (string argb_hex)
 string
 Colour::to_argb_string () const
 {
-       stringstream s;
-       s << "FF";
-       s << hex
-         << setw(2) << setfill('0') << r
-         << setw(2) << setfill('0') << g
-         << setw(2) << setfill('0') << b;
-
-       string t = s.str();
-       to_upper (t);
-       return t;
+       char buffer[9];
+       snprintf (buffer, sizeof(buffer), "FF%02X%02X%02X", r, g, b);
+       return buffer;
+}
+
+/** @return An RGB string of the form RRGGBB, where e.g. RR is a two-character
+ *  hex value.
+ */
+string
+Colour::to_rgb_string () const
+{
+       char buffer[7];
+       snprintf (buffer, sizeof(buffer), "%02X%02X%02X", r, g, b);
+       return buffer;
 }
 
 /** operator== for Colours.
@@ -253,11 +287,11 @@ dcp::direction_to_string (Direction v)
 Direction
 dcp::string_to_direction (string s)
 {
-       if (s == "ltr") {
+       if (s == "ltr" || s == "horizontal") {
                return DIRECTION_LTR;
        } else if (s == "rtl") {
                return DIRECTION_RTL;
-       } else if (s == "ttb") {
+       } else if (s == "ttb" || s == "vertical") {
                return DIRECTION_TTB;
        } else if (s == "btt") {
                return DIRECTION_BTT;