From 4d406c620b0211a5e27c19187d963241120f8838 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Thu, 2 Jul 2015 13:21:16 +0100
Subject: Add support for reading <font> tags in SubRip.

---
 src/dcp/font.cc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/dcp')

diff --git a/src/dcp/font.cc b/src/dcp/font.cc
index b2fd128..64787c7 100644
--- a/src/dcp/font.cc
+++ b/src/dcp/font.cc
@@ -35,7 +35,7 @@ dcp::Font::Font (cxml::ConstNodePtr node)
 	italic = node->optional_bool_attribute ("Italic");
 	optional<string> c = node->optional_string_attribute ("Color");
 	if (c) {
-		colour = Colour (c.get ());
+		colour = Colour::from_argb_hex (c.get ());
 	}
 	optional<string> const e = node->optional_string_attribute ("Effect");
 	if (e) {
@@ -43,15 +43,15 @@ dcp::Font::Font (cxml::ConstNodePtr node)
 	}
 	c = node->optional_string_attribute ("EffectColor");
 	if (c) {
-		effect_colour = Colour (c.get ());
+		effect_colour = Colour::from_argb_hex (c.get ());
 	}
 }
 
 dcp::Font::Font (std::list<boost::shared_ptr<Font> > const & font_nodes)
 	: size (0)
 	, italic (false)
-	, colour ("FFFFFFFF")
-	, effect_colour ("FFFFFFFF")
+	, colour (Colour::from_argb_hex ("FFFFFFFF"))
+	, effect_colour (Colour::from_argb_hex ("FFFFFFFF"))
 {
 	for (list<shared_ptr<Font> >::const_iterator i = font_nodes.begin(); i != font_nodes.end(); ++i) {
 		if ((*i)->id) {
-- 
cgit v1.2.3