old
/
legacy-imlib2
3
0
Fork 4
Code Issues 3 Pull Requests Projects Releases Wiki Activity

PNM loader: Fix P1 when spaces are omitted

This commit is contained in:
Kim Woelders 2022-01-17 06:41:40 +01:00
parent 10f692c946
commit f4e8e1414b
1 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,6 +40,31 @@ mm_getc(void)
return ch;
}
static int
mm_get01(void)
{
int ch;
for (;;)
{
ch = mm_getc();
switch (ch)
{
case '0':
return 0;
case '1':
return 1;
case ' ':
case '\t':
case '\r':
case '\n':
continue;
default:
return -1;
}
}
}
static int
mm_getu(unsigned int *pui)
{
@ -187,15 +212,11 @@ load2(ImlibImage * im, int load_data)
{
for (x = 0; x < w; x++)
{
if (mm_getu(&gval))
i = mm_get01();
if (i < 0)
goto quit;
if (gval == 1)
*ptr2++ = 0xff000000;
else if (gval == 0)
*ptr2++ = 0xffffffff;
else
goto quit;
*ptr2++ = i ? 0xff000000 : 0xffffffff;
}
if (im->lc && __imlib_LoadProgressRows(im, y, 1))