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

Fix XPM decoder for images using color (1,0,0) and also using a mask.

Browse Source 
Mask color was always set to that value because
FindFirstUnusedColour was called on an empty image.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50933 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2007-12-28 04:37:35 +00:00
parent 0d1c4edee3
commit c284bc61bd
1 changed files with 30 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/common/xpmdecod.cpp
View File

@@ -265,7 +265,7 @@ typedef struct
#define myRGB(r,g,b) ((wxUint32)r<<16|(wxUint32)g<<8|(wxUint32)b) #define myRGB(r,g,b) ((wxUint32)r<<16|(wxUint32)g<<8|(wxUint32)b)
static rgbRecord theRGBRecords[] = static const rgbRecord theRGBRecords[] =
{ {
{"aliceblue", myRGB(240, 248, 255)}, {"aliceblue", myRGB(240, 248, 255)},
{"antiquewhite", myRGB(250, 235, 215)}, {"antiquewhite", myRGB(250, 235, 215)},
@@ -504,7 +504,7 @@ static rgbRecord theRGBRecords[] =
{"yellowgreen", myRGB(50, 216, 56)}, {"yellowgreen", myRGB(50, 216, 56)},
{NULL, myRGB(0, 0, 0)} {NULL, myRGB(0, 0, 0)}
}; };
static int numTheRGBRecords = 235; static const int numTheRGBRecords = 235;
static unsigned char ParseHexadecimal(char digit1, char digit2) static unsigned char ParseHexadecimal(char digit1, char digit2)
{ {
@@ -666,10 +666,10 @@ wxImage wxXPMDecoder::ReadData(const char* const* xpm_data)
size_t i, j, i_key; size_t i, j, i_key;
char key[64]; char key[64];
const char *clr_def; const char *clr_def;
bool hasMask;
wxXPMColourMap clr_tbl; wxXPMColourMap clr_tbl;
wxXPMColourMap::iterator it; wxXPMColourMap::iterator it;
wxString maskKey; wxString maskKey;
wxString keyString;
/* /*
* Read hints and initialize structures: * Read hints and initialize structures:
@@ -688,12 +688,10 @@ wxImage wxXPMDecoder::ReadData(const char* const* xpm_data)
// 8bit RGB... // 8bit RGB...
wxCHECK_MSG(chars_per_pixel < 64, wxNullImage, wxT("XPM colormaps this large not supported.")); wxCHECK_MSG(chars_per_pixel < 64, wxNullImage, wxT("XPM colormaps this large not supported."));
if ( !img.Create(width, height) ) if (!img.Create(width, height, false))
return wxNullImage; return wxNullImage;
img.SetMask(false);
key[chars_per_pixel] = '\0'; key[chars_per_pixel] = '\0';
hasMask = false;
/* /*
* Create colour map: * Create colour map:
@@ -731,32 +729,41 @@ wxImage wxXPMDecoder::ReadData(const char* const* xpm_data)
return wxNullImage; return wxNullImage;
} }
keyString = key;
if ( isNone ) if ( isNone )
{ maskKey = keyString;
hasMask = true;
maskKey = key;
}
clr_tbl[key] = clr_data; clr_tbl[keyString] = clr_data;
} }
// deal with the mask: we must replace pseudo-colour "None" with the mask // deal with the mask: we must replace pseudo-colour "None" with the mask
// colour (which can be any colour not otherwise used in the image) // colour (which can be any colour not otherwise used in the image)
if (hasMask) if (!maskKey.empty())
{ {
unsigned char r, g, b; wxLongToLongHashMap rgb_table;
if ( !img.FindFirstUnusedColour(&r, &g, &b) ) long rgb;
const size_t n = clr_tbl.size();
wxXPMColourMap::const_iterator iter = clr_tbl.begin();
for (i = 0; i < n; ++i, ++iter)
{
const wxXPMColourMapData& data = iter->second;
rgb = (data.R << 16) + (data.G << 8) + data.B;
rgb_table[rgb];
}
for (rgb = 0; rgb <= 0xffffff && rgb_table.count(rgb); ++rgb)
;
if (rgb > 0xffffff)
{ {
wxLogError(_("XPM: no colors left to use for mask!")); wxLogError(_("XPM: no colors left to use for mask!"));
return wxNullImage; return wxNullImage;
} }
clr_tbl[maskKey].R = r; wxXPMColourMapData& maskData = clr_tbl[maskKey];
clr_tbl[maskKey].G = g; maskData.R = wxByte(rgb >> 16);
clr_tbl[maskKey].B = b; maskData.G = wxByte(rgb >> 8);
maskData.B = wxByte(rgb);
img.SetMask(true); img.SetMaskColour(maskData.R, maskData.G, maskData.B);
img.SetMaskColour(r, g, b);
} }
/* /*
@@ -766,7 +773,6 @@ wxImage wxXPMDecoder::ReadData(const char* const* xpm_data)
unsigned char *img_data = img.GetData(); unsigned char *img_data = img.GetData();
wxXPMColourMap::iterator entry; wxXPMColourMap::iterator entry;
wxXPMColourMap::iterator end = clr_tbl.end(); wxXPMColourMap::iterator end = clr_tbl.end();
wxString keyString;
for (j = 0; j < height; j++) for (j = 0; j < height; j++)
{ {
@@ -797,12 +803,10 @@ wxImage wxXPMDecoder::ReadData(const char* const* xpm_data)
// each remaining pixel if we don't bail out // each remaining pixel if we don't bail out
return wxNullImage; return wxNullImage;
} }
else
{ img_data[0] = entry->second.R;
img_data[0] = entry->second.R; img_data[1] = entry->second.G;
img_data[1] = entry->second.G; img_data[2] = entry->second.B;
img_data[2] = entry->second.B;
}
} }
} }