Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed wrong handling of magenta (patch #882201)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25316 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2004-01-22 20:05:34 +00:00
parent 25b1b5668e
commit a2d452d042
1 changed files with 37 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/common/xpmdecod.cpp
View File

@@ -125,7 +125,7 @@ bool wxXPMDecoder::CanRead(wxInputStream& stream)
unsigned char buf[9]; unsigned char buf[9];
if ( !stream.Read(buf, WXSIZEOF(buf)) ) if ( !stream.Read(buf, WXSIZEOF(buf)) )
return FALSE; return false;
stream.SeekI(-(off_t)WXSIZEOF(buf), wxFromCurrent); 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]); *r = ParseHexadecimal(inname[1], inname[2]);
*g = ParseHexadecimal(inname[1*ofs+1], inname[1*ofs+2]); *g = ParseHexadecimal(inname[1*ofs+1], inname[1*ofs+2]);
*b = ParseHexadecimal(inname[2*ofs+1], inname[2*ofs+2]); *b = ParseHexadecimal(inname[2*ofs+1], inname[2*ofs+2]);
*isNone = FALSE; *isNone = false;
return TRUE; return true;
} }
name = strdup(inname); name = strdup(inname);
@@ -582,12 +582,12 @@ static bool GetRGBFromName(const char *inname, bool *isNone,
bool found; bool found;
if ( strcmp(name, "none") == 0 ) if ( strcmp(name, "none") == 0 )
{ {
*isNone = TRUE; *isNone = true;
found = TRUE; found = true;
} }
else // not "None" else // not "None"
{ {
found = FALSE; found = false;
// binary search: // binary search:
left = 0; left = 0;
@@ -602,8 +602,8 @@ static bool GetRGBFromName(const char *inname, bool *isNone,
*r = (unsigned char)((rgbVal >> 16) & 0xFF); *r = (unsigned char)((rgbVal >> 16) & 0xFF);
*g = (unsigned char)((rgbVal >> 8) & 0xFF); *g = (unsigned char)((rgbVal >> 8) & 0xFF);
*b = (unsigned char)((rgbVal) & 0xFF); *b = (unsigned char)((rgbVal) & 0xFF);
*isNone = FALSE; *isNone = false;
found = TRUE; found = true;
break; break;
} }
else if ( cmp < 0 ) else if ( cmp < 0 )
@@ -671,6 +671,8 @@ wxImage wxXPMDecoder::ReadData(const char **xpm_data)
bool hasMask; bool hasMask;
wxXPMColourMapData clr_data; wxXPMColourMapData clr_data;
wxXPMColourMap clr_tbl; wxXPMColourMap clr_tbl;
wxXPMColourMap::iterator it;
wxString maskKey;
/* /*
* Read hints and initialize structures: * Read hints and initialize structures:
@@ -692,9 +694,9 @@ wxImage wxXPMDecoder::ReadData(const char **xpm_data)
img.Create(width, height); img.Create(width, height);
if ( !img.Ok() ) return img; if ( !img.Ok() ) return img;
img.SetMask(FALSE); img.SetMask(false);
key[chars_per_pixel] = wxT('\0'); key[chars_per_pixel] = wxT('\0');
hasMask = FALSE; hasMask = false;
/* /*
* Create colour map: * Create colour map:
@@ -707,7 +709,8 @@ wxImage wxXPMDecoder::ReadData(const char **xpm_data)
if ( clr_def == NULL ) 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; clr_data.R = 255, clr_data.G = 0, clr_data.B = 255;
} }
else else
@@ -716,29 +719,43 @@ wxImage wxXPMDecoder::ReadData(const char **xpm_data)
if ( !GetRGBFromName(clr_def, &isNone, if ( !GetRGBFromName(clr_def, &isNone,
&clr_data.R, &clr_data.G, &clr_data.B) ) &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; clr_data.R = 255, clr_data.G = 0, clr_data.B = 255;
} }
else else
{ {
if ( isNone ) if ( isNone )
{ {
img.SetMask(TRUE); img.SetMask(true);
img.SetMaskColour(255, 0, 255); img.SetMaskColour(255, 0, 255);
hasMask = TRUE; hasMask = true;
clr_data.R = 255, clr_data.G = 0, clr_data.B = 255; clr_data.R = 255, clr_data.G = 0, clr_data.B = 255;
} maskKey = key;
else
{
if ( hasMask && clr_data.R == 255 &&
clr_data.G == 0 && clr_data.B == 255 )
clr_data.B = 254;
} }
} }
} }
clr_tbl[key] = clr_data; 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: * Parse image data:
*/ */