fixed wrong handling of magenta (patch #882201)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25316 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -125,7 +125,7 @@ bool wxXPMDecoder::CanRead(wxInputStream& stream)
|
||||
unsigned char buf[9];
|
||||
|
||||
if ( !stream.Read(buf, WXSIZEOF(buf)) )
|
||||
return FALSE;
|
||||
return false;
|
||||
|
||||
stream.SeekI(-(off_t)WXSIZEOF(buf), wxFromCurrent);
|
||||
|
||||
@@ -547,8 +547,8 @@ static bool GetRGBFromName(const char *inname, bool *isNone,
|
||||
*r = ParseHexadecimal(inname[1], inname[2]);
|
||||
*g = ParseHexadecimal(inname[1*ofs+1], inname[1*ofs+2]);
|
||||
*b = ParseHexadecimal(inname[2*ofs+1], inname[2*ofs+2]);
|
||||
*isNone = FALSE;
|
||||
return TRUE;
|
||||
*isNone = false;
|
||||
return true;
|
||||
}
|
||||
|
||||
name = strdup(inname);
|
||||
@@ -582,12 +582,12 @@ static bool GetRGBFromName(const char *inname, bool *isNone,
|
||||
bool found;
|
||||
if ( strcmp(name, "none") == 0 )
|
||||
{
|
||||
*isNone = TRUE;
|
||||
found = TRUE;
|
||||
*isNone = true;
|
||||
found = true;
|
||||
}
|
||||
else // not "None"
|
||||
{
|
||||
found = FALSE;
|
||||
found = false;
|
||||
|
||||
// binary search:
|
||||
left = 0;
|
||||
@@ -602,8 +602,8 @@ static bool GetRGBFromName(const char *inname, bool *isNone,
|
||||
*r = (unsigned char)((rgbVal >> 16) & 0xFF);
|
||||
*g = (unsigned char)((rgbVal >> 8) & 0xFF);
|
||||
*b = (unsigned char)((rgbVal) & 0xFF);
|
||||
*isNone = FALSE;
|
||||
found = TRUE;
|
||||
*isNone = false;
|
||||
found = true;
|
||||
break;
|
||||
}
|
||||
else if ( cmp < 0 )
|
||||
@@ -671,6 +671,8 @@ wxImage wxXPMDecoder::ReadData(const char **xpm_data)
|
||||
bool hasMask;
|
||||
wxXPMColourMapData clr_data;
|
||||
wxXPMColourMap clr_tbl;
|
||||
wxXPMColourMap::iterator it;
|
||||
wxString maskKey;
|
||||
|
||||
/*
|
||||
* Read hints and initialize structures:
|
||||
@@ -692,9 +694,9 @@ wxImage wxXPMDecoder::ReadData(const char **xpm_data)
|
||||
img.Create(width, height);
|
||||
if ( !img.Ok() ) return img;
|
||||
|
||||
img.SetMask(FALSE);
|
||||
img.SetMask(false);
|
||||
key[chars_per_pixel] = wxT('\0');
|
||||
hasMask = FALSE;
|
||||
hasMask = false;
|
||||
|
||||
/*
|
||||
* Create colour map:
|
||||
@@ -707,7 +709,8 @@ wxImage wxXPMDecoder::ReadData(const char **xpm_data)
|
||||
|
||||
if ( clr_def == NULL )
|
||||
{
|
||||
wxLogError(_("XPM: malformed colour definition '%s'!"), xpm_data[1+i]);
|
||||
wxLogError(_("XPM: malformed colour definition '%s'!"),
|
||||
xpm_data[1+i]);
|
||||
clr_data.R = 255, clr_data.G = 0, clr_data.B = 255;
|
||||
}
|
||||
else
|
||||
@@ -716,29 +719,43 @@ wxImage wxXPMDecoder::ReadData(const char **xpm_data)
|
||||
if ( !GetRGBFromName(clr_def, &isNone,
|
||||
&clr_data.R, &clr_data.G, &clr_data.B) )
|
||||
{
|
||||
wxLogError(_("XPM: malformed colour definition '%s'!"), xpm_data[1+i]);
|
||||
wxLogError(_("XPM: malformed colour definition '%s'!"),
|
||||
xpm_data[1+i]);
|
||||
clr_data.R = 255, clr_data.G = 0, clr_data.B = 255;
|
||||
}
|
||||
else
|
||||
{
|
||||
if ( isNone )
|
||||
{
|
||||
img.SetMask(TRUE);
|
||||
img.SetMask(true);
|
||||
img.SetMaskColour(255, 0, 255);
|
||||
hasMask = TRUE;
|
||||
hasMask = true;
|
||||
clr_data.R = 255, clr_data.G = 0, clr_data.B = 255;
|
||||
}
|
||||
else
|
||||
{
|
||||
if ( hasMask && clr_data.R == 255 &&
|
||||
clr_data.G == 0 && clr_data.B == 255 )
|
||||
clr_data.B = 254;
|
||||
maskKey = key;
|
||||
}
|
||||
}
|
||||
}
|
||||
clr_tbl[key] = clr_data;
|
||||
}
|
||||
|
||||
/*
|
||||
* Modify colour entries with RGB = (255,0,255) to (255,0,254) if
|
||||
* mask colour is present (so that existing pixels with (255,0,255)
|
||||
* magenta colour are not incorrectly made transparent):
|
||||
*/
|
||||
if (hasMask)
|
||||
{
|
||||
for (it = clr_tbl.begin(); it != clr_tbl.end(); it++)
|
||||
{
|
||||
if (it->second.R == 255 && it->second.G == 0 &&
|
||||
it->second.B == 255 &&
|
||||
it->first != maskKey)
|
||||
{
|
||||
it->second.B = 254;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Parse image data:
|
||||
*/
|
||||
|
Reference in New Issue
Block a user