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

Load_IFF() Fix parsing of ILBM with mask=1

Browse Source
This commit is contained in:
Thomas Bernard 2018-02-07 12:18:40 +01:00
parent fcb0502d2b
commit 925dd7fcc9
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/fileformats.c
View File

@ -1238,9 +1238,9 @@ printf("%d x %d = %d %d\n", tiny_width, tiny_height, tiny_width*tiny_height, s
for (y_pos = 0; y_pos < context->Height; y_pos++) for (y_pos = 0; y_pos < context->Height; y_pos++)
{ {
if (Image_HAM <= 1) if (Image_HAM <= 1)
Draw_IFF_line(context, buffer+y_pos*line_size, y_pos,real_line_size, stored_bit_planes); Draw_IFF_line(context, buffer+y_pos*line_size, y_pos,real_line_size, real_bit_planes);
else else
Draw_IFF_line_HAM(context, buffer+y_pos*line_size, y_pos,real_line_size, stored_bit_planes, SHAM_palettes, SHAM_palette_count); Draw_IFF_line_HAM(context, buffer+y_pos*line_size, y_pos,real_line_size, real_bit_planes, SHAM_palettes, SHAM_palette_count);
} }
} }
free(buffer); free(buffer);
@ -1276,11 +1276,11 @@ printf("%d x %d = %d %d\n", tiny_width, tiny_height, tiny_width*tiny_height, s
if (Read_bytes(IFF_file,buffer,line_size)) if (Read_bytes(IFF_file,buffer,line_size))
{ {
if (PCHG_palettes) if (PCHG_palettes)
Draw_IFF_line_PCHG(context, buffer, y_pos,real_line_size, stored_bit_planes, PCHG_palettes); Draw_IFF_line_PCHG(context, buffer, y_pos,real_line_size, real_bit_planes, PCHG_palettes);
else if (Image_HAM <= 1) else if (Image_HAM <= 1)
Draw_IFF_line(context, buffer, y_pos,real_line_size, stored_bit_planes); Draw_IFF_line(context, buffer, y_pos,real_line_size, real_bit_planes);
else else
Draw_IFF_line_HAM(context, buffer, y_pos,real_line_size, stored_bit_planes, SHAM_palettes, SHAM_palette_count); Draw_IFF_line_HAM(context, buffer, y_pos,real_line_size, real_bit_planes, SHAM_palettes, SHAM_palette_count);
} }
else else
File_error=21; File_error=21;
@ -1336,11 +1336,11 @@ printf("%d x %d = %d %d\n", tiny_width, tiny_height, tiny_width*tiny_height, s
if (!File_error) if (!File_error)
{ {
if (PCHG_palettes) if (PCHG_palettes)
Draw_IFF_line_PCHG(context, buffer, y_pos,real_line_size, stored_bit_planes, PCHG_palettes); Draw_IFF_line_PCHG(context, buffer, y_pos,real_line_size, real_bit_planes, PCHG_palettes);
else if (Image_HAM <= 1) else if (Image_HAM <= 1)
Draw_IFF_line(context, buffer, y_pos,real_line_size,stored_bit_planes); Draw_IFF_line(context, buffer, y_pos,real_line_size,real_bit_planes);
else else
Draw_IFF_line_HAM(context, buffer, y_pos,real_line_size, stored_bit_planes, SHAM_palettes, SHAM_palette_count); Draw_IFF_line_HAM(context, buffer, y_pos,real_line_size, real_bit_planes, SHAM_palettes, SHAM_palette_count);
} }
} }
free(buffer); free(buffer);