gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-19 20:38:08 +01:00
Code Issues Projects Releases Wiki Activity

- fix for 0 sized gif images too

Browse Source 
- fixed wrong test for 0 size in nxpm.c
This commit is contained in:
dan
2002-10-25 04:21:09 +00:00
parent 0f0afc48ab
commit 3af4aa7846
4 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -23,7 +23,7 @@ Changes since version 0.80.1:
- Added kinput2 bug workaround in stock WMWindowAttributes (Seiichi SATO - Added kinput2 bug workaround in stock WMWindowAttributes (Seiichi SATO
<sato@cvs-net.co.jp>) <sato@cvs-net.co.jp>)
- Added Belarusian translation (Ihar Viarheichyk <iverg@mail.ru>) - Added Belarusian translation (Ihar Viarheichyk <iverg@mail.ru>)
- Fixed wrlib to not try to load braindead images with 0x0 size - Fixed wrlib not to load braindead images with 0 sized width or height
- Removed double no-position-display when cycling position display types - Removed double no-position-display when cycling position display types
with Shift key while moving windows. with Shift key while moving windows.
- Changed the default position display while moving a window to 'Center'. - Changed the default position display while moving a window to 'Center'.

10
wrlib/gif.c
View File

@@ -62,7 +62,7 @@ RLoadGIF(RContext *context, char *file, int index)
RErrorCode = RERR_BADINDEX; RErrorCode = RERR_BADINDEX;
gif = DGifOpenFileName(file); gif = DGifOpenFileName(file);
if (!gif) { if (!gif) {
switch (GifLastError()) { switch (GifLastError()) {
case D_GIF_ERR_OPEN_FAILED: case D_GIF_ERR_OPEN_FAILED:
@@ -78,6 +78,12 @@ RLoadGIF(RContext *context, char *file, int index)
return NULL; return NULL;
} }
if (gif->Image.Width<1 || gif->Image.Height<1) {
DGifCloseFile(gif);
RErrorCode = RERR_BADIMAGEFILE;
return NULL;
}
colormap = gif->SColorMap; colormap = gif->SColorMap;
i = 0; i = 0;
@@ -206,7 +212,7 @@ giferr:
default: default:
RErrorCode = RERR_BADIMAGEFILE; RErrorCode = RERR_BADIMAGEFILE;
break; break;
} }
bye: bye:
if (image) if (image)
RReleaseImage(image); RReleaseImage(image);

4
wrlib/nxpm.c
View File

@@ -86,9 +86,9 @@ RGetImageFromXPMData(RContext *context, char **data)
int w, h, ccount, csize; int w, h, ccount, csize;
if (sscanf(data[line++], "%i %i %i %i", &w, &h, &ccount, &csize)!=4 if (sscanf(data[line++], "%i %i %i %i", &w, &h, &ccount, &csize)!=4
|| w <= 1 || h <= 1 || ccount <= 0 || csize <= 0) || w <= 0 || h <= 0 || ccount <= 0 || csize <= 0)
goto bad_format; goto bad_format;
if (csize!=1 && csize!=2) if (csize!=1 && csize!=2)
goto bad_format; goto bad_format;

4
wrlib/tiff.c
View File

@@ -81,10 +81,10 @@ RLoadTIFF(RContext *context, char *file, int index)
TIFFClose(tif); TIFFClose(tif);
return NULL; return NULL;
} }
/* read data */ /* read data */
ptr = data = (uint32*)_TIFFmalloc(width * height * sizeof(uint32)); ptr = data = (uint32*)_TIFFmalloc(width * height * sizeof(uint32));
if (!data) { if (!data) {
RErrorCode = RERR_NOMEMORY; RErrorCode = RERR_NOMEMORY;
} else { } else {