From 925dd7fcc9ddfe23c050c4a5eb1f36426cd1f28f Mon Sep 17 00:00:00 2001 From: Thomas Bernard Date: Wed, 7 Feb 2018 12:18:40 +0100 Subject: [PATCH] Load_IFF() Fix parsing of ILBM with mask=1 --- src/fileformats.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/fileformats.c b/src/fileformats.c index ed11b94e..f1998fdc 100644 --- a/src/fileformats.c +++ b/src/fileformats.c @@ -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++) { 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 - 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); @@ -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 (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) - 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 - 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 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 (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) - 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 - 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);