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

plug-ins: fix #5960 Gimp loads 16 bit DDS images with luminosity as 8 bit.

Browse Source 
So far all dds images were loaded as 8 bit per channel which makes
sense for most but not all dds formats.

This commit implements loading in 16 bit for "L16" - a 16 bit
luminance channel.

In addition to that we improve security a bit  by not assuming
that L16 is the only left over case but instead explicitly
checking the correct value of rmask for L16.

For other cases we now set an error with enough details
to identify the type of DDS image that needs extra
handling.

(cherry picked from commit fe228a6f6f)

# Conflicts:
#	plug-ins/file-dds/ddsread.c
This commit is contained in:
Jacob Boerema
2021-04-26 17:34:18 -04:00
parent 0bc3653f98
commit e29219fee7
1 changed files with 34 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,6 +55,7 @@ typedef struct
unsigned char rbits, gbits, bbits, abits;
unsigned int rmask, gmask, bmask, amask;
unsigned int bpp, gimp_bpp;
unsigned int gimp_bps; /* bytes per sample */
int tile_height;
unsigned char *palette;
} dds_load_info_t;
@ -113,6 +114,7 @@ read_dds (gchar *filename,
dds_load_info_t d;
gint *layers, layer_count;
GimpImageBaseType type;
GimpPrecision precision;
int i, j;
if (interactive_dds)
@ -191,6 +193,7 @@ read_dds (gchar *filename,
hdr.pixelfmt.flags |= DDPF_ALPHAPIXELS;
}
d.gimp_bps = 1; /* Most formats will be converted to 1 byte per sample */
if (hdr.pixelfmt.flags & DDPF_FOURCC)
{
switch (GETL32(hdr.pixelfmt.fourcc))
@ -238,11 +241,22 @@ read_dds (gchar *filename,
type = GIMP_RGB;
}
else //L16
else if (hdr.pixelfmt.rmask == 0xffff) /* L16 */
{
d.gimp_bpp = 1;
d.gimp_bpp = 2;
d.gimp_bps = 2;
type = GIMP_GRAY;
}
else
{
g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
"Unsupported uncompressed dds format: "
"bpp: %d, Rmask: %x, Gmask: %x, Bmask: %x, Amask: %x",
hdr.pixelfmt.bpp,
hdr.pixelfmt.rmask, hdr.pixelfmt.gmask,
hdr.pixelfmt.bmask, hdr.pixelfmt.amask);
return GIMP_PDB_EXECUTION_ERROR;
}
}
else
{
@ -273,7 +287,16 @@ read_dds (gchar *filename,
}
}
image = gimp_image_new (hdr.width, hdr.height, type);
if (d.gimp_bps == 2)
{
precision = GIMP_PRECISION_U16_NON_LINEAR;
}
else
{
precision = GIMP_PRECISION_U8_NON_LINEAR;
}
image = gimp_image_new_with_precision (hdr.width, hdr.height, type, precision);
if (image == -1)
{
@ -930,10 +953,10 @@ load_layer (FILE *fp,
type = (hdr->pixelfmt.amask == 0x8000) ? GIMP_RGBA_IMAGE : GIMP_RGB_IMAGE;
bablfmt = (hdr->pixelfmt.amask == 0x8000) ? babl_format ("R'G'B'A u8") : babl_format ("R'G'B' u8");
}
else /* L16 */
else if (hdr->pixelfmt.rmask == 0xffff) /* L16 */
{
type = GIMP_GRAY_IMAGE;
bablfmt = babl_format ("Y' u8");
bablfmt = babl_format ("Y' u16");
}
break;
case 3: type = GIMP_RGB_IMAGE; bablfmt = babl_format ("R'G'B' u8"); break;
@ -1098,8 +1121,12 @@ load_layer (FILE *fp,
(pixel >> d->ashift << (8 - d->abits) & d->amask) * 255 / d->amask;
}
}
else //L16
pixels[pos] = (unsigned char)(255 * ((float)(pixel & 0xffff) / 65535.0f));
else if (hdr->pixelfmt.rmask == 0xffff) /* L16 */
{
guint16 *pixels16 = (guint16 *) &pixels[pos];
*pixels16 = (guint16) (pixel & 0xffff);
}
}
else
{