m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Load_IFF() set a default grayscale palette for files without CMAP

Browse Source
This commit is contained in:
Thomas Bernard 2018-03-06 16:18:52 +01:00
parent 144207f6d6
commit c03984fccb
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/fileformats.c
View File

@ -1049,6 +1049,20 @@ void Load_IFF(T_IO_Context * context)
ratio = PIXEL_WIDE; // 1.5 <= ratio ratio = PIXEL_WIDE; // 1.5 <= ratio
} }
bpp = header.BitPlanes; bpp = header.BitPlanes;
if (bpp <= 8)
{
unsigned int i;
// Set a default grayscale palette : if the
// ILBM/PBM file has no palette, it should be assumed to be a
// Gray scale picture.
if (Config.Clear_palette)
memset(context->Palette,0,sizeof(T_Palette));
nb_colors = 1 << bpp;
for (i = 0; i < nb_colors; i++)
context->Palette[i].R =
context->Palette[i].G =
context->Palette[i].B = (i * 255) / (nb_colors - 1);
}
} }
else if (memcmp(section, "ANHD", 4) == 0) // ANimation HeaDer else if (memcmp(section, "ANHD", 4) == 0) // ANimation HeaDer
{ {
@ -1457,8 +1471,6 @@ void Load_IFF(T_IO_Context * context)
bpp = 3 * (header.BitPlanes - 2); // HAM6 = 12bpp, HAM8 = 18bpp bpp = 3 * (header.BitPlanes - 2); // HAM6 = 12bpp, HAM8 = 18bpp
} }
if (Config.Clear_palette)
memset(context->Palette,0,sizeof(T_Palette));
if (Read_bytes(IFF_file,context->Palette,3*nb_colors)) if (Read_bytes(IFF_file,context->Palette,3*nb_colors))
{ {
section_size -= 3*nb_colors; section_size -= 3*nb_colors;