* in this Software without prior written authorization from GROUPE BULL.
*/
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "xpmdecod.h"
#endif
#include "wx/image.h"
#include "wx/utils.h"
#include "wx/log.h"
+#include "wx/hashmap.h"
#include "wx/intl.h"
#include <string.h>
-#ifdef __VISUALC__
#include <ctype.h>
-#endif
#include "wx/xpmdecod.h"
{
unsigned char buf[9];
- stream.Read(buf, 9);
- stream.SeekI(-9, wxFromCurrent);
+ if ( !stream.Read(buf, WXSIZEOF(buf)) )
+ return false;
+
+ stream.SeekI(-(off_t)WXSIZEOF(buf), wxFromCurrent);
- return (memcmp(buf, "/* XPM */", 9) == 0);
+ return memcmp(buf, "/* XPM */", WXSIZEOF(buf)) == 0;
}
wxImage wxXPMDecoder::ReadFile(wxInputStream& stream)
wxCharBuffer buffer(length);
char *xpm_buffer = (char *)buffer.data();
- if ( stream.Read(xpm_buffer, length).LastError() == wxSTREAM_READ_ERROR )
+ if ( stream.Read(xpm_buffer, length).GetLastError() == wxSTREAM_READ_ERROR )
return wxNullImage;
xpm_buffer[length] = '\0';
{"seagreen", myRGB(82, 149, 132)},
{"seashell", myRGB(255, 245, 238)},
{"sienna", myRGB(150, 82, 45)},
+ {"silver", myRGB(192, 192, 192)},
{"skyblue", myRGB(114, 159, 255)},
{"slateblue", myRGB(126, 136, 171)},
{"slategray", myRGB(112, 128, 144)},
{"yellowgreen", myRGB(50, 216, 56)},
{NULL, myRGB(0, 0, 0)}
};
-static int numTheRGBRecords = 234;
+static int numTheRGBRecords = 235;
static unsigned char ParseHexadecimal(char digit1, char digit2)
{
*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);
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;
*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 )
return NULL;
}
-class wxXPMColourMapData : public wxObject
+struct wxXPMColourMapData
{
- public:
- unsigned char R,G,B;
+ unsigned char R,G,B;
};
+WX_DECLARE_STRING_HASH_MAP(wxXPMColourMapData, wxXPMColourMap);
wxImage wxXPMDecoder::ReadData(const char **xpm_data)
{
wxChar key[64];
const char *clr_def;
bool hasMask;
- wxXPMColourMapData *clr_data;
- wxHashTable clr_tbl(wxKEY_STRING);
+ wxXPMColourMapData clr_data;
+ wxXPMColourMap clr_tbl;
+ wxXPMColourMap::iterator it;
+ wxString maskKey;
/*
* Read hints and initialize structures:
img.Create(width, height);
if ( !img.Ok() ) return img;
- img.SetMask(FALSE);
+ img.SetMask(false);
key[chars_per_pixel] = wxT('\0');
- hasMask = FALSE;
- clr_tbl.DeleteContents(TRUE);
+ hasMask = false;
/*
* Create colour map:
for (i_key = 0; i_key < chars_per_pixel; i_key++)
key[i_key] = (wxChar)xpm_data[1 + i][i_key];
clr_def = ParseColor(xpm_data[1 + i] + chars_per_pixel);
- clr_data = new wxXPMColourMapData;
if ( clr_def == NULL )
{
- wxLogError(_("XPM: malformed colour definition '%s'!"), xpm_data[1+i]);
- clr_data->R = 255, clr_data->G = 0, clr_data->B = 255;
+ wxLogError(_("XPM: malformed colour definition '%s'!"),
+ xpm_data[1+i]);
+ clr_data.R = 255, clr_data.G = 0, clr_data.B = 255;
}
else
{
bool 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]);
- clr_data->R = 255, clr_data->G = 0, clr_data->B = 255;
+ 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;
- 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;
+ hasMask = true;
+ clr_data.R = 255, clr_data.G = 0, clr_data.B = 255;
+ maskKey = key;
}
}
}
- clr_tbl.Put(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;
+ }
+ }
}
/*
*/
unsigned char *img_data = img.GetData();
+ wxXPMColourMap::iterator entry;
+ wxXPMColourMap::iterator end = clr_tbl.end();
+
for (j = 0; j < height; j++)
{
for (i = 0; i < width; i++, img_data += 3)
for (i_key = 0; i_key < chars_per_pixel; i_key++)
key[i_key] = (wxChar)xpm_data[1 + colors_cnt + j]
[chars_per_pixel * i + i_key];
- clr_data = (wxXPMColourMapData*) clr_tbl.Get(key);
- if ( clr_data == NULL )
+ entry = clr_tbl.find(key);
+ if ( entry == end )
{
wxLogError(_("XPM: Malformed pixel data!"));
+
+ // better return right now as otherwise we risk to flood the
+ // user with error messages as something seems to be seriously
+ // wrong with the file and so we could give this message for
+ // each remaining pixel if we don't bail out
+ return wxNullImage;
}
else
{
- img_data[0] = clr_data->R;
- img_data[1] = clr_data->G;
- img_data[2] = clr_data->B;
+ img_data[0] = entry->second.R;
+ img_data[1] = entry->second.G;
+ img_data[2] = entry->second.B;
}
}
}
projects / wxWidgets.git / blobdiff