haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More robust hex-color interpretation.

This commit is contained in:
Jeff Young 2021-08-31 21:23:46 +01:00
parent 098fdf2981
commit 641a6902b7
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
common/gal/color4d.cpp
View File

@ -146,18 +146,32 @@ wxString COLOR4D::ToWxString( long flags ) const
bool COLOR4D::SetFromHexString( const wxString& aColorString ) bool COLOR4D::SetFromHexString( const wxString& aColorString )
{ {
if( aColorString.length() != 9 || aColorString.GetChar( 0 ) != '#' ) wxString str = aColorString;
str.Trim( true );
str.Trim( false );
if( str.length() < 7 || str.GetChar( 0 ) != '#' )
return false; return false;
unsigned long tmp; unsigned long tmp;
if( wxSscanf( aColorString.wx_str() + 1, wxT( "%lx" ), &tmp ) != 1 ) if( wxSscanf( str.wx_str() + 1, wxT( "%lx" ), &tmp ) != 1 )
return false; return false;
r = ( (tmp >> 24) & 0xFF ) / 255.0; if( str.length() >= 9 )
g = ( (tmp >> 16) & 0xFF ) / 255.0; {
b = ( (tmp >> 8) & 0xFF ) / 255.0; r = ( (tmp >> 24) & 0xFF ) / 255.0;
a = ( tmp & 0xFF ) / 255.0; g = ( (tmp >> 16) & 0xFF ) / 255.0;
b = ( (tmp >> 8) & 0xFF ) / 255.0;
a = ( tmp & 0xFF ) / 255.0;
}
else
{
r = ( (tmp >> 16) & 0xFF ) / 255.0;
g = ( (tmp >> 8) & 0xFF ) / 255.0;
b = ( tmp & 0xFF ) / 255.0;
a = 1.0;
}
return true; return true;
} }