mirror of
https://port.numenaute.org/aleajactaest/khanat-code-old.git
synced 2024-12-05 01:34:48 +00:00
Changed: Don't try to convert string to CRGBA if less than 3 integers
This commit is contained in:
parent
9a9dda21ad
commit
f76acd744f
1 changed files with 16 additions and 10 deletions
|
@ -734,11 +734,13 @@ void CRGBA::buildFromHLS(float h, float l, float s)
|
|||
|
||||
CRGBA CRGBA::stringToRGBA( const char *ptr )
|
||||
{
|
||||
if (!ptr)
|
||||
return NLMISC::CRGBA::White;
|
||||
|
||||
if (ptr)
|
||||
{
|
||||
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( g, 0, 255 );
|
||||
clamp( b, 0, 255 );
|
||||
|
@ -746,6 +748,10 @@ CRGBA CRGBA::stringToRGBA( const char *ptr )
|
|||
|
||||
return CRGBA( r,g,b,a );
|
||||
}
|
||||
}
|
||||
|
||||
return NLMISC::CRGBA::White;
|
||||
}
|
||||
|
||||
std::string CRGBA::toString() const
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue