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

doxygen for T_BMP_Header + remove commented code in Test_BMP()

Browse Source
This commit is contained in:
Thomas Bernard 2019-01-09 09:47:01 +01:00
parent dcfd0894e0
commit 0aca83d029
No known key found for this signature in database
GPG Key ID: 0FF11B67A5C0863C
1 changed files with 18 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/fileformats.c
View File

@ -3048,25 +3048,26 @@ void Load_INFO(T_IO_Context * context)
* *
* @{ * @{
*/ */
/// BMP file header
typedef struct typedef struct
{ {
byte Signature[2]; // ='BM' = 0x4D42 byte Signature[2]; ///< ='BM' = 0x4D42
dword Size_1; // file size dword Size_1; ///< file size
word Reserved_1; // 0 word Reserved_1; ///< 0
word Reserved_2; // 0 word Reserved_2; ///< 0
dword Offset; // Offset of bitmap data start dword Offset; ///< Offset of bitmap data start
dword Size_2; ///< BITMAPINFOHEADER size
dword Size_2; // 40 dword Width; ///< Image Width
dword Width; int32_t Height; ///< Image Height. signed: negative means a top-down bitmap (rare)
int32_t Height; // signed: negative means a top-down bitmap (rare) word Planes; ///< Should be 1
word Planes; // 1 word Nb_bits; ///< Bits per pixel : 1,2,4,8,16,24 or 32
word Nb_bits; // 1,4,8 ou 24 dword Compression; ///< Known values : 0=BI_RGB, 1=BI_RLE8, 2=BI_RLE4, 3=BI_BITFIELDS, 4=BI_JPEG, 5=BI_PNG
dword Compression; dword Size_3; ///< (optional) byte size of bitmap data
dword Size_3; dword XPM; ///< (optional) horizontal pixels-per-meter
dword XPM; dword YPM; ///< (optional) vertical pixels-per-meter
dword YPM; dword Nb_Clr; ///< number of color indexes used in the table. 0 for default (1 << Nb_bits)
dword Nb_Clr; dword Clr_Imprt; ///< number of color indexes that are required for displaying the bitmap. 0 : all colors are required.
dword Clr_Imprt;
} T_BMP_Header; } T_BMP_Header;
/// Test for BMP format /// Test for BMP format
@ -3083,18 +3084,6 @@ void Test_BMP(T_IO_Context * context, FILE * file)
&& Read_word_le(file,&(header.Reserved_2)) && Read_word_le(file,&(header.Reserved_2))
&& Read_dword_le(file,&(header.Offset)) && Read_dword_le(file,&(header.Offset))
&& Read_dword_le(file,&(header.Size_2)) && Read_dword_le(file,&(header.Size_2))
/*
&& Read_dword_le(file,&(header.Width))
&& Read_dword_le(file,(dword *)&(header.Height))
&& Read_word_le(file,&(header.Planes))
&& Read_word_le(file,&(header.Nb_bits))
&& Read_dword_le(file,&(header.Compression))
&& Read_dword_le(file,&(header.Size_3))
&& Read_dword_le(file,&(header.XPM))
&& Read_dword_le(file,&(header.YPM))
&& Read_dword_le(file,&(header.Nb_Clr))
&& Read_dword_le(file,&(header.Clr_Imprt))
*/
) )
{ {
if (header.Signature[0]=='B' && header.Signature[1]=='M' && if (header.Signature[0]=='B' && header.Signature[1]=='M' &&