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

Reorganize Load_BMP()

Browse Source
This commit is contained in:
Thomas Bernard 2019-01-07 12:55:17 +01:00
parent 71d1089442
commit 55dadae79d
No known key found for this signature in database
GPG Key ID: 0FF11B67A5C0863C
1 changed files with 187 additions and 180 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
src/fileformats.c
View File

@ -3161,7 +3161,7 @@ static void Load_BMP_Pixels(T_IO_Context * context, FILE * file, unsigned int co
short y_pos; short y_pos;
byte * buffer; byte * buffer;
byte value; byte value;
byte a,b,c=0; byte a,b;
int bits[4]; int bits[4];
int shift[4]; int shift[4];
int i; int i;
@ -3321,57 +3321,63 @@ static void Load_BMP_Pixels(T_IO_Context * context, FILE * file, unsigned int co
break; break;
case 2 : // BI_RLE4 Compression case 2 : // BI_RLE4 Compression
x_pos=0; x_pos = 0;
y_pos=context->Height-1; y_pos = context->Height-1;
if(Read_byte(file, &a)!=1 || Read_byte(file, &b) != 1) while (!File_error)
File_error =2;
while ( (!File_error) && ((a)||(b!=1)) )
{ {
if (a) // Encoded mode (A fois les 1/2 pixels de B) if(!(Read_byte(file, &a) && Read_byte(file, &b)))
for (index=1; index<=a; index++)
{ {
if (index & 1) File_error = 2;
Set_pixel(context, x_pos,y_pos,b>>4); break;
else
Set_pixel(context, x_pos,y_pos,b&0xF);
x_pos++;
} }
else // Absolute mode if (a > 0) // Encoded mode : pixel count = a
{
GFX2_Log(GFX2_DEBUG, "BI_RLE4: %d &%02X\n", a, b);
for (index = 0; index < a; index++)
Set_pixel(context, x_pos++, y_pos, ((index & 1) ? b : (b >> 4)) & 0x0f);
}
else
{
// a == 0 : Escape code
byte c = 0;
GFX2_Log(GFX2_DEBUG, "BI_RLE4: %d %d\n", a, b);
if (b == 1) // end of bitmap
break;
switch (b) switch (b)
{ {
case 0 : //End of line case 0 : //End of line
x_pos=0; x_pos = 0;
y_pos--; y_pos--;
break; break;
case 1 : // End of bitmap
break;
case 2 : // Delta case 2 : // Delta
if(Read_byte(file, &a)!=1 || Read_byte(file, &b)!=1) if(Read_byte(file, &a)!=1 || Read_byte(file, &b)!=1)
File_error=2; File_error=2;
x_pos+=a; x_pos += a;
y_pos-=b; y_pos -= b;
break; break;
default: // Nouvelle série (B 1/2 pixels bruts) default: // Absolute mode : pixel count = b
for (index=1; ((index<=b) && (!File_error)); index++,x_pos++) for (index = 0; index < b && !File_error; index++, x_pos++)
{ {
if (index&1) if (index&1)
Set_pixel(context, x_pos,y_pos,c&0xF);
else
{ {
if(Read_byte(file, &c)!=1) File_error=2; if (!Read_byte(file, &c))
File_error=2;
else
Set_pixel(context, x_pos,y_pos,c>>4); Set_pixel(context, x_pos,y_pos,c>>4);
} }
else
Set_pixel(context, x_pos,y_pos,c&0xF);
} }
// On lit l'octet rendant le nombre d'octets pair, si if ((b + 1) & 2)
// nécessaire. Encore un truc de crétin "made in MS".
if ( ((b&3)==1) || ((b&3)==2) )
{ {
byte dummy; // read a pad byte to enforce word alignment
if(Read_byte(file, &dummy)!=1) File_error=2; if (!Read_byte(file, &c))
File_error = 2;
}
} }
} }
if(Read_byte(file, &a)!=1 || Read_byte(file, &b)!=1) File_error=2;
} }
break; break;
default: default:
@ -3390,12 +3396,18 @@ void Load_BMP(T_IO_Context * context)
byte true_color = 0; byte true_color = 0;
dword mask[4]; // R G B A dword mask[4]; // R G B A
File_error=0; file = Open_file_read(context);
if (file == NULL)
if ((file=Open_file_read(context)))
{ {
file_size=File_length_file(file); File_error = 1;
return;
}
File_error = 0;
file_size = File_length_file(file);
/* Read header */
if (!(Read_bytes(file,header.Signature,2) if (!(Read_bytes(file,header.Signature,2)
&& Read_dword_le(file,&(header.Size_1)) && Read_dword_le(file,&(header.Size_1))
&& Read_word_le(file,&(header.Reserved_1)) && Read_word_le(file,&(header.Reserved_1))
@ -3422,7 +3434,8 @@ void Load_BMP(T_IO_Context * context)
&& Read_dword_le(file,&(header.YPM)) && Read_dword_le(file,&(header.YPM))
&& Read_dword_le(file,&(header.Nb_Clr)) && Read_dword_le(file,&(header.Nb_Clr))
&& Read_dword_le(file,&(header.Clr_Imprt)) && Read_dword_le(file,&(header.Clr_Imprt))
)) File_error = 1; ))
File_error = 1;
else else
GFX2_Log(GFX2_DEBUG, "Windows BMP %ux%d planes=%u bpp=%u compression=%u\n", GFX2_Log(GFX2_DEBUG, "Windows BMP %ux%d planes=%u bpp=%u compression=%u\n",
header.Width, header.Height, header.Planes, header.Nb_bits, header.Compression); header.Width, header.Height, header.Planes, header.Nb_bits, header.Compression);
@ -3451,11 +3464,13 @@ void Load_BMP(T_IO_Context * context)
else else
{ {
Warning("Unknown BMP type"); Warning("Unknown BMP type");
File_error = 2; File_error = 1;
} }
} }
if (File_error == 0) if (File_error == 0)
{ {
/* header was read */
switch (header.Nb_bits) switch (header.Nb_bits)
{ {
case 1 : case 1 :
@ -3463,9 +3478,9 @@ void Load_BMP(T_IO_Context * context)
case 4 : case 4 :
case 8 : case 8 :
if (header.Nb_Clr) if (header.Nb_Clr)
nb_colors=header.Nb_Clr; nb_colors = header.Nb_Clr;
else else
nb_colors=1<<header.Nb_bits; nb_colors = 1 << header.Nb_bits;
break; break;
case 16: case 16:
case 24: case 24:
@ -3473,18 +3488,18 @@ void Load_BMP(T_IO_Context * context)
true_color = 1; true_color = 1;
break; break;
default: default:
Warning("Unsupported bit per pixel"); GFX2_Log(GFX2_WARNING, "BMP: Unsupported bit per pixel %u\n", header.Nb_bits);
File_error = 1; File_error = 1;
} }
if (header.Height < 0) if (header.Height < 0)
{ {
negative_height=1; negative_height = 1;
header.Height = -header.Height; header.Height = -header.Height;
} }
else else
{ {
negative_height=0; negative_height = 0;
} }
// Image 16/24/32 bits // Image 16/24/32 bits
@ -3503,7 +3518,7 @@ void Load_BMP(T_IO_Context * context)
mask[3] = 0; mask[3] = 0;
if (File_error == 0) if (File_error == 0)
{ {
Pre_load(context, header.Width,header.Height,file_size,FORMAT_BMP,PIXEL_SIMPLE,header.Nb_bits); Pre_load(context, header.Width, header.Height, file_size, FORMAT_BMP, PIXEL_SIMPLE, header.Nb_bits);
if (File_error==0) if (File_error==0)
{ {
if (header.Size_2 >= 108 || (true_color && header.Compression == 3)) // BI_BITFIELDS if (header.Size_2 >= 108 || (true_color && header.Compression == 3)) // BI_BITFIELDS
@ -3515,7 +3530,6 @@ void Load_BMP(T_IO_Context * context)
if (header.Size_2 >= 108) if (header.Size_2 >= 108)
{ {
Read_dword_le(file,&mask[3]); // Alpha mask Read_dword_le(file,&mask[3]); // Alpha mask
if (header.Size_2 == 124)
fseek(file, header.Size_2 - 40 - 16, SEEK_CUR); // skip extended v4/v5 header fields fseek(file, header.Size_2 - 40 - 16, SEEK_CUR); // skip extended v4/v5 header fields
} }
GFX2_Log(GFX2_DEBUG, "BMP masks : R=%08x G=%08x B=%08x A=%08x\n", mask[0], mask[1], mask[2], mask[3]); GFX2_Log(GFX2_DEBUG, "BMP masks : R=%08x G=%08x B=%08x A=%08x\n", mask[0], mask[1], mask[2], mask[3]);
@ -3533,14 +3547,7 @@ void Load_BMP(T_IO_Context * context)
} }
} }
} }
else
{
File_error=1;
}
fclose(file); fclose(file);
}
else
File_error=1;
} }