aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-11-14 03:09:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changed: Don't try to convert string to CRGBA if less than 3 integers

Browse source
This commit is contained in:
kervala 2015-11-13 19:38:46 +01:00
parent 74fd0ba557
commit 5ea4193018
1 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
code/nel/src/misc/rgba.cpp
View file

@ -734,11 +734,13 @@ void CRGBA::buildFromHLS(float h, float l, float s)
CRGBA CRGBA::stringToRGBA( const char *ptr ) CRGBA CRGBA::stringToRGBA( const char *ptr )
{ {
if (!ptr) if (ptr)
return NLMISC::CRGBA::White; {
int r = 255, g = 255, b = 255, a = 255; int r = 255, g = 255, b = 255, a = 255;
sscanf( ptr, "%d %d %d %d", &r, &g, &b, &a );
// we need at least 3 integer values to consider string is valid
if (sscanf( ptr, "%d %d %d %d", &r, &g, &b, &a ) >= 3)
{
clamp( r, 0, 255 ); clamp( r, 0, 255 );
clamp( g, 0, 255 ); clamp( g, 0, 255 );
clamp( b, 0, 255 ); clamp( b, 0, 255 );
@ -746,6 +748,10 @@ CRGBA CRGBA::stringToRGBA( const char *ptr )
return CRGBA( r,g,b,a ); return CRGBA( r,g,b,a );
} }
}
return NLMISC::CRGBA::White;
}
std::string CRGBA::toString() const std::string CRGBA::toString() const
{ {