X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftypes.cc;h=693b9ab20272ee810407fd36a1e55b0071f0a0e8;hb=81450a3f659c466ba178a1173fbd79465f3060d5;hp=a00e82613bf50385b2954cc024fa9cf4061f34a0;hpb=af9b2212f0d8f8c1f53aaf29e520b812dfdc321c;p=libdcp.git

diff --git a/src/types.cc b/src/types.cc
index a00e8261..693b9ab2 100644
--- a/src/types.cc
+++ b/src/types.cc
@@ -15,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]);
@@ -49,14 +49,21 @@ 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
 {
@@ -72,12 +79,20 @@ Color::to_argb_string () const
 	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)
 {
@@ -103,7 +118,7 @@ libdcp::effect_to_string (Effect e)
 		return "shadow";
 	}
 
-	throw MiscError ("unknown effect type");
+	boost::throw_exception (MiscError ("unknown effect type"));
 }
 
 Effect
@@ -117,7 +132,7 @@ libdcp::string_to_effect (string s)
 		return SHADOW;
 	}
 
-	throw DCPReadError ("unknown subtitle effect type");
+	boost::throw_exception (DCPReadError ("unknown subtitle effect type"));
 }
 
 string
@@ -132,7 +147,7 @@ libdcp::valign_to_string (VAlign v)
 		return "bottom";
 	}
 
-	throw MiscError ("unknown valign type");
+	boost::throw_exception (MiscError ("unknown valign type"));
 }
 
 VAlign
@@ -146,7 +161,7 @@ libdcp::string_to_valign (string s)
 		return BOTTOM;
 	}
 	
-	throw DCPReadError ("unknown subtitle valign type");
+	boost::throw_exception (DCPReadError ("unknown subtitle valign type"));
 }