X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c4a25811ccd431aceae4523951061b202d4f2611..1b7735e10f1f9dc889c9817a8066ef34e399328f:/src/common/xpmdecod.cpp diff --git a/src/common/xpmdecod.cpp b/src/common/xpmdecod.cpp index 6f593fc989..68c99def3f 100644 --- a/src/common/xpmdecod.cpp +++ b/src/common/xpmdecod.cpp @@ -263,7 +263,7 @@ wxImage wxXPMDecoder::ReadFile(wxInputStream& stream) typedef struct { - char *name; + const char *name; wxUint32 rgb; } rgbRecord; @@ -702,7 +702,7 @@ wxImage wxXPMDecoder::ReadData(const char **xpm_data) { 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 )