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

Load_IFF() use CAMG to set EHB palette

Browse Source 
Fixes loading of Cougar_Sanasmatron.iff
Some ILBM have 64 colors in palette for EHB images.
That's OK when the 32 extra colors are valid (half bright ones)
but some have garbage in the CMAP
This commit is contained in:
Thomas Bernard 2018-02-06 12:52:07 +01:00
parent d94fb966a2
commit 268887f456
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/fileformats.c
View File

@ -587,6 +587,18 @@ static void PBM_Decode(T_IO_Context * context, FILE * file, byte compression, wo
} }
} }
static void IFF_Set_EHB_Palette(T_IO_Context * context)
{
int i, j; // 32 colors in the palette.
for (i=0; i<32; i++) // The next 32 colors are the same with values divided by 2
{
j=i+32;
context->Palette[j].R=context->Palette[i].R>>1;
context->Palette[j].G=context->Palette[i].G>>1;
context->Palette[j].B=context->Palette[i].B>>1;
}
}
void Load_IFF(T_IO_Context * context) void Load_IFF(T_IO_Context * context)
{ {
FILE * IFF_file; FILE * IFF_file;
@ -884,17 +896,8 @@ void Load_IFF(T_IO_Context * context)
memset(context->Palette,0,sizeof(T_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))
{ {
if ((nb_colors==32) && (header.BitPlanes==6)) if (((nb_colors==32) || (AmigaViewModes & 0x80)) && (header.BitPlanes==6))
{ // This is a Extra Half-Brite (EHB) 64 color image. IFF_Set_EHB_Palette(context); // This is a Extra Half-Brite (EHB) 64 color image.
int i, j; // 32 colors in the palette.
for (i=0; i<32; i++) // The next 32 colors are the same with values divided by 2
{
j=i+32;
context->Palette[j].R=context->Palette[i].R>>1;
context->Palette[j].G=context->Palette[i].G>>1;
context->Palette[j].B=context->Palette[i].B>>1;
}
}
section_size -= 3*nb_colors; section_size -= 3*nb_colors;
while(section_size > 0) // Read padding bytes while(section_size > 0) // Read padding bytes
@ -949,6 +952,8 @@ void Load_IFF(T_IO_Context * context)
Image_HAM = header.BitPlanes; Image_HAM = header.BitPlanes;
bpp = 3 * (header.BitPlanes - 2); bpp = 3 * (header.BitPlanes - 2);
} }
if ((AmigaViewModes & 0x80) && (header.BitPlanes == 6)) // This is a Extra Half-Brite (EHB) 64 color image.
IFF_Set_EHB_Palette(context); // Set the palette in case CAMG is after CMAP
} }
else if (memcmp(section, "DPPV", 4) == 0) // DPaint II ILBM perspective chunk else if (memcmp(section, "DPPV", 4) == 0) // DPaint II ILBM perspective chunk
{ {