dallasgroot/Gimp
dallasgroot/Gimp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

plug-ins: fix incorrect loading of PSP images with uncompressed channel data.

Browse source 
According to the PSP specifications "Each scanline in the image data is stored on a 4 byte boundary.	"
Based on all actual images I've seen this is incorrect. Possibly it is a leftover from an older specification.
This commit is contained in:
Jacob Boerema 2020-08-05 22:39:55 -04:00 committed by Jehan
parent fcb9de07f6
commit f4088adefa
1 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
plug-ins/common/file-psp.c
View file

@ -1339,16 +1339,7 @@ read_channel_data (FILE *f,
case PSP_COMP_NONE:
if (bytespp == 1)
{
if ((width % 4) == 0)
fread (pixels[0], height * width, 1, f);
else
{
for (y = 0; y < height; y++)
{
fread (pixels[y], width, 1, f);
fseek (f, 4 - (width % 4), SEEK_CUR);
}
}
fread (pixels[0], height * width, 1, f);
}
else
{
@ -1358,8 +1349,8 @@ read_channel_data (FILE *f,
guchar *p, *q;
fread (buf, width, 1, f);
if (width % 4)
fseek (f, 4 - (width % 4), SEEK_CUR);
/* Contrary to what the PSP specification seems to suggest
scanlines are not stored on a 4-byte boundary. */
p = buf;
q = pixels[y] + offset;
for (i = 0; i < width; i++)