diff options
| author | marha <marha@users.sourceforge.net> | 2012-04-10 14:58:33 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-04-10 14:58:33 +0200 |
| commit | 5f8448ef6b85a9ff72c5af4cec99183c8bb60dc6 (patch) | |
| tree | c10939819ba1167cdc905a0c105c7ae4091abbc3 /libXpm/src/parse.c | |
| parent | 67326634496ef21b4acbf4cef2f05040d34aef9b (diff) | |
| download | vcxsrv-5f8448ef6b85a9ff72c5af4cec99183c8bb60dc6.tar.gz vcxsrv-5f8448ef6b85a9ff72c5af4cec99183c8bb60dc6.tar.bz2 vcxsrv-5f8448ef6b85a9ff72c5af4cec99183c8bb60dc6.zip | |
Updated following packages:
bigreqsproto-1.1.2
fontsproto-2.1.2
recordproto-1.14.2
scrnsaverproto-1.2.2
xcmiscproto-1.2.2
libXt-1.1.3
xhost-1.0.5
kbproto-1.0.6
libXrender-0.9.7
libxkbfile-1.0.8
freetype-2.4.9
libXaw-1.0.10
libXpm-3.5.10
xproto-7.0.23
Diffstat (limited to 'libXpm/src/parse.c')
| -rw-r--r-- | libXpm/src/parse.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libXpm/src/parse.c b/libXpm/src/parse.c index 5c7915f78..ff23a4738 100644 --- a/libXpm/src/parse.c +++ b/libXpm/src/parse.c @@ -70,7 +70,7 @@ LFUNC(ParsePixels, int, (xpmData *data, unsigned int width, unsigned int cpp, XpmColor *colorTable, xpmHashTable *hashtable, unsigned int **pixels)); -char *xpmColorKeys[] = { +const char *xpmColorKeys[] = { "s", /* key #1: symbol */ "m", /* key #2: mono visual */ "g4", /* key #3: 4 grays visual */ @@ -205,7 +205,8 @@ xpmParseColors( unsigned int lastwaskey; /* key read */ char buf[BUFSIZ+1]; char curbuf[BUFSIZ]; /* current buffer */ - char **sptr, *s; + const char **sptr; + char *s; XpmColor *color; XpmColor *colorTable; char **defaults; @@ -380,7 +381,7 @@ ParsePixels( unsigned int a, x, y; if ((height > 0 && width >= UINT_MAX / height) || - width * height >= UINT_MAX / sizeof(unsigned int)) + width * height >= UINT_MAX / sizeof(unsigned int)) return XpmNoMemory; #ifndef FOR_MSW iptr2 = (unsigned int *) XpmMalloc(sizeof(unsigned int) * width * height); |