X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/19c0043f74cb81d3dc32a8c58be3f51654ffddbc..a4ea083bbdf710d3234dcbd2eafb5d0e078f8348:/src/common/xpmdecod.cpp diff --git a/src/common/xpmdecod.cpp b/src/common/xpmdecod.cpp index 8d38a3132e..f76418958c 100644 --- a/src/common/xpmdecod.cpp +++ b/src/common/xpmdecod.cpp @@ -2,7 +2,6 @@ // Name: src/common/xpmdecod.cpp // Purpose: wxXPMDecoder // Author: John Cristy, Vaclav Slavik -// RCS-ID: $Id$ // Copyright: (c) John Cristy, Vaclav Slavik // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -122,8 +121,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; } @@ -620,7 +617,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;