Try removing the DCI companding from the xyz->rgb conversion.

[libdcp.git] / src / types.cc

diff --git a/src/types.cc b/src/types.cc
index 50aee2a294da8a0b05427343ceaae7196a60bf22..693b9ab20272ee810407fd36a1e55b0071f0a0e8 100644 (file)
--- a/src/types.cc
+++ b/src/types.cc
@@ -1,5 +1,6 @@
 #include <vector>
 #include <cstdio>
+#include <iomanip>
 #include <boost/lexical_cast.hpp>
 #include <boost/algorithm/string.hpp>
 #include "types.h"
@@ -14,7 +15,7 @@ Fraction::Fraction (string s)
        vector<string> b;
        split (b, s, is_any_of (" "));
        if (b.size() != 2) {
-               throw XMLError ("malformed fraction " + s + " in XML node");
+               boost::throw_exception (XMLError ("malformed fraction " + s + " in XML node"));
        }
        numerator = lexical_cast<int> (b[0]);
        denominator = lexical_cast<int> (b[1]);
@@ -48,24 +49,119 @@ Color::Color (int r_, int g_, int b_)
 
 }
 
+/** Construct a Color from an ARGB hex string; the alpha value is ignored.
+ *  @param argb_hex A string of the form AARRGGBB, where e.g. RR is a two-character
+ *  hex value.
+ */
 Color::Color (string argb_hex)
 {
        int alpha;
        if (sscanf (argb_hex.c_str(), "%2x%2x%2x%2x", &alpha, &r, &g, &b) < 4) {
-               throw XMLError ("could not parse colour string");
+               boost::throw_exception (XMLError ("could not parse colour string"));
        }
 }
 
+/** @return An ARGB string of the form AARRGGBB, where e.g. RR is a two-character
+ *  hex value.  The alpha value will always be FF (ie 255; maximum alpha).
+ */
+string
+Color::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;
+}
 
+/** operator== for Colors.
+ *  @param a First color to compare.
+ *  @param b Second color to compare.
+ */
 bool
 libdcp::operator== (Color const & a, Color const & b)
 {
        return (a.r == b.r && a.g == b.g && a.b == b.b);
 }
 
+/** operator!= for Colors.
+ *  @param a First color to compare.
+ *  @param b Second color to compare.
+ */
+bool
+libdcp::operator!= (Color const & a, Color const & b)
+{
+       return !(a == b);
+}
+
 ostream &
 libdcp::operator<< (ostream& s, Color const & c)
 {
        s << "(" << c.r << ", " << c.g << ", " << c.b << ")";
        return s;
 }
+
+string
+libdcp::effect_to_string (Effect e)
+{
+       switch (e) {
+       case NONE:
+               return "none";
+       case BORDER:
+               return "border";
+       case SHADOW:
+               return "shadow";
+       }
+
+       boost::throw_exception (MiscError ("unknown effect type"));
+}
+
+Effect
+libdcp::string_to_effect (string s)
+{
+       if (s == "none") {
+               return NONE;
+       } else if (s == "border") {
+               return BORDER;
+       } else if (s == "shadow") {
+               return SHADOW;
+       }
+
+       boost::throw_exception (DCPReadError ("unknown subtitle effect type"));
+}
+
+string
+libdcp::valign_to_string (VAlign v)
+{
+       switch (v) {
+       case TOP:
+               return "top";
+       case CENTER:
+               return "center";
+       case BOTTOM:
+               return "bottom";
+       }
+
+       boost::throw_exception (MiscError ("unknown valign type"));
+}
+
+VAlign
+libdcp::string_to_valign (string s)
+{
+       if (s == "top") {
+               return TOP;
+       } else if (s == "center") {
+               return CENTER;
+       } else if (s == "bottom") {
+               return BOTTOM;
+       }
+       
+       boost::throw_exception (DCPReadError ("unknown subtitle valign type"));
+}
+
+