return false if we cant parse nor allocate color string

This commit is contained in:
fluxgen 2002-11-28 19:22:40 +00:00
parent a4668b0772
commit 5cef8b6505

View file

@ -19,7 +19,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: Color.cc,v 1.1 2002/11/26 16:01:27 fluxgen Exp $ // $Id: Color.cc,v 1.2 2002/11/28 19:22:40 fluxgen Exp $
#include "Color.hh" #include "Color.hh"
@ -39,6 +39,7 @@ unsigned char maxValue(unsigned short colval) {
}; };
namespace FbTk { namespace FbTk {
Color::Color(): Color::Color():
m_allocated(false), m_allocated(false),
m_screen(0) { m_screen(0) {
@ -78,10 +79,13 @@ bool Color::setFromString(const char *color_string, int screen) {
XColor color; XColor color;
if (! XParseColor(disp, colm, color_string, &color)) if (! XParseColor(disp, colm, color_string, &color)) {
cerr<<"FbTk::Color: Parse color error: \""<<color_string<<"\""<<endl; cerr<<"FbTk::Color: Parse color error: \""<<color_string<<"\""<<endl;
else if (! XAllocColor(disp, colm, &color)) return false;
} else if (! XAllocColor(disp, colm, &color)) {
cerr<<"FbTk::Color: Allocation error: \""<<color_string<<"\""<<endl; cerr<<"FbTk::Color: Allocation error: \""<<color_string<<"\""<<endl;
return false;
}