goulash-lover
/
legacy-imlib2
forked from old/legacy-imlib2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix pnm image loading in certain situations (ticket 721). 

"It fails with "large" images, written with multiple pixels on the same line."

Patch by quentin.stievenart@gmail.com

SVN revision: 57697
This commit is contained in:
Kim Woelders 2011-03-11 21:13:19 +00:00
parent 5983044ae4
commit a1a018317a
1 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/modules/loaders/loader_pnm.c
View File

@ -215,15 +215,22 @@ load(ImlibImage * im, ImlibProgressFunction progress,
x = 0;
while (x < w)
{
if (!buf[i]) /* fill buffer */
int k;
/* check 4 chars ahead to see if we need to
fill the buffer */
for (k = 0; k < 4; k++)
{
if (!fgets(buf, 255, f))
if (!buf[i+k]) /* fill buffer */
{
free(idata);
fclose(f);
return 0;
if (fseek(f, -k, SEEK_CUR) == -1 || !fgets(buf, 255, f))
{
free(idata);
fclose(f);
return 0;
}
i = 0;
break;
}
i = 0;
}
while (buf[i] && isspace(buf[i]))
i++;
@ -308,15 +315,22 @@ load(ImlibImage * im, ImlibProgressFunction progress,
x = 0;
while (x < w3)
{
if (!buf[i]) /* fill buffer */
int k;
/* check 4 chars ahead to see if we need to
fill the buffer */
for (k = 0; k < 4; k++)
{
if (!fgets(buf, 255, f))
if (!buf[i+k]) /* fill buffer */
{
free(idata);
fclose(f);
return 0;
if (fseek(f, -k, SEEK_CUR) == -1 || !fgets(buf, 255, f))
{
free(idata);
fclose(f);
return 0;
}
i = 0;
break;
}
i = 0;
}
while (buf[i] && isspace(buf[i]))
i++;