From ccaa3af7e1b264956b40c4dd908442d755aa2b81 Mon Sep 17 00:00:00 2001 From: ronag Date: Mon, 15 Aug 2011 12:10:34 +0000 Subject: [PATCH] git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.0.2@1185 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d --- core/producer/color/color_producer.cpp | 5 ++++- core/producer/stage.cpp | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/core/producer/color/color_producer.cpp b/core/producer/color/color_producer.cpp index 7c14aaf28..a6793b2de 100644 --- a/core/producer/color/color_producer.cpp +++ b/core/producer/color/color_producer.cpp @@ -56,8 +56,11 @@ std::wstring get_hex_color(const std::wstring& str) if(str.at(0) == '#') return str.length() == 7 ? L"#FF" + str.substr(1) : str; + if(boost::iequals(str, L"EMPTY")) + return L"#00000000"; + if(boost::iequals(str, L"BLACK")) - return L"#000000FF"; + return L"#FF000000"; if(boost::iequals(str, L"WHITE")) return L"#FFFFFFFF"; diff --git a/core/producer/stage.cpp b/core/producer/stage.cpp index fdaa5a0a3..8262b6ebe 100644 --- a/core/producer/stage.cpp +++ b/core/producer/stage.cpp @@ -99,7 +99,6 @@ public: }); return frames; - } catch(...) { -- 2.39.2