X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/942368061731ed2a42949287dfd1281e8c28b22d..87f0b1323b7ac77f02133b836c8dfee63b0fd387:/src/common/xpmdecod.cpp diff --git a/src/common/xpmdecod.cpp b/src/common/xpmdecod.cpp index ae43e513fd..744a5db1e8 100644 --- a/src/common/xpmdecod.cpp +++ b/src/common/xpmdecod.cpp @@ -108,6 +108,7 @@ license is as follows: #include "wx/hashmap.h" #include "wx/stream.h" #include "wx/image.h" + #include "wx/palette.h" #endif #include @@ -121,8 +122,6 @@ bool wxXPMDecoder::CanRead(wxInputStream& stream) if ( !stream.Read(buf, WXSIZEOF(buf)) ) return false; - stream.SeekI(-(wxFileOffset)WXSIZEOF(buf), wxFromCurrent); - return memcmp(buf, "/* XPM */", WXSIZEOF(buf)) == 0; } @@ -619,7 +618,7 @@ static bool GetRGBFromName(const char *inname, bool *isNone, static const char *ParseColor(const char *data) { - static const char *targets[] = + static const char *const targets[] = {"c ", "g ", "g4 ", "m ", "b ", "s ", NULL}; const char *p, *r;