#include "wx/intl.h"
#include <string.h>
+#ifdef __VISUALC__
+#include <ctype.h>
+#endif
+
#include "wx/xpmdecod.h"
#if wxUSE_STREAMS
wxImage wxXPMDecoder::ReadFile(wxInputStream& stream)
{
size_t length = stream.GetSize();
- wxCHECK_MSG(length != 0, wxNullImage, wxT("Cannot read XPM from stream of unknown size"));
+ wxCHECK_MSG( length != 0, wxNullImage,
+ wxT("Cannot read XPM from stream of unknown size") );
- char *xpm_buffer = new char[length+1];
- char *p, *q;
- size_t i;
+ // use a smart buffer to be sure to free memory even when we return on
+ // error
+ wxCharBuffer buffer(length);
+ char *xpm_buffer = (char *)buffer.data();
if ( stream.Read(xpm_buffer, length).LastError() == wxSTREAM_READ_ERROR )
return wxNullImage;
xpm_buffer[length] = '\0';
/*
* Remove comments from the file:
*/
+ char *p, *q;
for (p = xpm_buffer; *p != '\0'; p++)
{
if ( (*p == '"') || (*p == '\'') )
/*
* Remove unquoted characters:
*/
- i = 0;
+ size_t i = 0;
for (p = xpm_buffer; *p != '\0'; p++)
{
if ( *p != '"' )
*/
wxImage img = ReadData(xpm_lines);
- delete[] xpm_buffer;
#ifdef __WIN16__
delete[] (char**) xpm_lines;
#else
delete[] xpm_lines;
#endif
+
return img;
}
#endif // wxUSE_STREAMS
typedef struct
{
- char *name;
+ const char *name;
wxUint32 rgb;
} rgbRecord;
{
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]);
+ clr_def = ParseColor(xpm_data[1 + i] + chars_per_pixel);
clr_data = new wxXPMColourMapData;
if ( clr_def == NULL )