From 88d345e857e13a0b51a2420eb0799b6b5109cd80 Mon Sep 17 00:00:00 2001 From: kervala Date: Mon, 2 Jan 2017 09:48:40 +0100 Subject: [PATCH] Changed: Allow to parse HTML color format in CRGBA::stringToRGBA --HG-- branch : develop --- code/nel/src/misc/rgba.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/code/nel/src/misc/rgba.cpp b/code/nel/src/misc/rgba.cpp index 822ee1006..d053887c4 100644 --- a/code/nel/src/misc/rgba.cpp +++ b/code/nel/src/misc/rgba.cpp @@ -748,6 +748,17 @@ CRGBA CRGBA::stringToRGBA( const char *ptr ) return CRGBA( r,g,b,a ); } + + // we need at least 3 hexadecimal values to consider string is valid + if (sscanf(ptr, "#%02x%02x%02x%02x", &r, &g, &b, &a) >= 3) + { + clamp(r, 0, 255); + clamp(g, 0, 255); + clamp(b, 0, 255); + clamp(a, 0, 255); + + return CRGBA(r, g, b, a); + } } return NLMISC::CRGBA::White;