callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

plug-ins: fix #5357 Image marked as compressed, but DDSD_LINEARSIZE is not set.

Browse Source 
(cherry picked from commit 81a3370e1d)
This commit is contained in:
Jacob Boerema 2020-07-08 22:53:15 -04:00 committed by Jehan
parent 430e60a898
commit 8f539680de
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
plug-ins/file-dds/ddsread.c
View File

@ -553,14 +553,28 @@ validate_header (dds_header_t *hdr)
return 0;
}
if ((hdr->flags & DDSD_PITCH) == (hdr->flags & DDSD_LINEARSIZE))
if (hdr->pixelfmt.flags & DDPF_FOURCC)
{
//g_message ("Warning: DDSD_PITCH or DDSD_LINEARSIZE is not set.\n");
if (hdr->pixelfmt.flags & DDPF_FOURCC)
hdr->flags |= DDSD_LINEARSIZE;
else
hdr->flags |= DDSD_PITCH;
if (hdr->flags & DDSD_PITCH)
{
g_message ("Warning: DDSD_PITCH is incorrectly set for DDPF_FOURCC!");
hdr->flags &= DDSD_PITCH;
}
if (! (hdr->flags & DDSD_LINEARSIZE))
{
g_message ("Warning: DDSD_LINEARSIZE is incorrectly not set for DDPF_FOURCC!");
hdr->flags |= DDSD_LINEARSIZE;
}
}
else
{
if (! (hdr->flags & DDSD_PITCH))
{
g_message ("Warning: DDSD_PITCH is not set!");
hdr->flags |= DDSD_PITCH;
}
}
/*
if ((hdr->pixelfmt.flags & DDPF_FOURCC) ==
(hdr->pixelfmt.flags & DDPF_RGB))
@ -1102,12 +1116,6 @@ load_layer (FILE *fp,
{
unsigned char *dst;
if (!(hdr->flags & DDSD_LINEARSIZE))
{
g_message ("Image marked as compressed, but DDSD_LINEARSIZE is not set.\n");
return 0;
}
dst = g_malloc (width * height * d->gimp_bpp);
memset (dst, 0, width * height * d->gimp_bpp);