Diff: Bitmap.h

Revision:

197:853d08e2fb53

Parent:

190:3132b7dfad82

--- a/Bitmap.h	Tue Feb 11 21:26:59 2020 +0000
+++ b/Bitmap.h	Tue Feb 11 21:51:42 2020 +0000
@@ -18,7 +18,8 @@
 //
 // Bitmap file data structures
 //
-// must align to 2-byte boundaries so it doesn't alter the memory image when 
+// must align to 2-byte boundaries so it doesn't alter the memory image when
+
 // bytes are read from the file system into this footprint.
 #ifdef __GNUC__
 #pragma pack(push, 1)
@@ -32,30 +33,31 @@
 /// Bitmap file header
 typedef struct                    /**** BMP file header structure ****/
     {
-    uint16_t    bfType;           ///< Magic number for file 
-    uint32_t    bfSize;           ///< Size of file 
+    uint16_t    bfType;           ///< Magic number for file
+    uint32_t    bfSize;           ///< Size of file
     uint16_t    bfReserved1;      ///< reserved placeholder for the structure footprint
     uint16_t    bfReserved2;      ///< reserved placeholder for the structure footprint
-    uint32_t    bfOffBits;        ///< Offset to bitmap data 
+    uint32_t    bfOffBits;        ///< Offset to bitmap data
+
     } BITMAPFILEHEADER ALIGNMENT;           // Size: 14B
-#ifdef WIN32
+#if (defined(WIN32))
 static_assert(sizeof(BITMAPFILEHEADER) == 14, "Alignment Error");
 #endif
 
 /// Bitmap information header
 typedef struct                    /**** BMP file info structure ****/
     {
-    uint32_t    biSize;           ///< Size of info header 
-    uint32_t    biWidth;          ///< Width of image 
-    uint32_t    biHeight;         ///< Height of image 
-    uint16_t    biPlanes;         ///< Number of color planes 
-    uint16_t    biBitCount;       ///< Number of bits per pixel 
-    uint32_t    biCompression;    ///< Type of compression to use 
-    uint32_t    biSizeImage;      ///< Size of image data 
-    int32_t     biXPelsPerMeter;  ///< X pixels per meter 
-    int32_t     biYPelsPerMeter;  ///< Y pixels per meter 
-    uint32_t    biClrUsed;        ///< Number of colors used 
-    uint32_t    biClrImportant;   ///< Number of important colors 
+    uint32_t    biSize;           ///< Size of info header
+    uint32_t    biWidth;          ///< Width of image
+    uint32_t    biHeight;         ///< Height of image
+    uint16_t    biPlanes;         ///< Number of color planes
+    uint16_t    biBitCount;       ///< Number of bits per pixel
+    uint32_t    biCompression;    ///< Type of compression to use
+    uint32_t    biSizeImage;      ///< Size of image data
+    int32_t     biXPelsPerMeter;  ///< X pixels per meter
+    int32_t     biYPelsPerMeter;  ///< Y pixels per meter
+    uint32_t    biClrUsed;        ///< Number of colors used
+    uint32_t    biClrImportant;   ///< Number of important colors
     } BITMAPINFOHEADER ALIGNMENT;           // Size: 40B
 #ifdef __GNUC__
 #pragma pack(pop)
@@ -78,10 +80,10 @@
 /// An RGB Quad data type used by the bitmap driver.
 typedef struct                       /**** Colormap entry structure ****/
     {
-    uint8_t  rgbBlue;          ///< Blue value 
-    uint8_t  rgbGreen;         ///< Green value 
-    uint8_t  rgbRed;           ///< Red value 
-    uint8_t  rgbReserved;      ///< Reserved 
+    uint8_t  rgbBlue;          ///< Blue value
+    uint8_t  rgbGreen;         ///< Green value
+    uint8_t  rgbRed;           ///< Red value
+    uint8_t  rgbReserved;      ///< Reserved
     } RGBQUAD;
 
 //typedef struct                       /**** Bitmap information structure ****/
@@ -103,7 +105,7 @@
     {
     uint16_t    Reserved_zero;  ///< Always zero
     uint16_t    icType;         ///< 1 for .ico, 2 for .cur
-    uint16_t    icImageCount;   ///< number of images in the file    
+    uint16_t    icImageCount;   ///< number of images in the file
     } ICOFILEHEADER;
 
 /// Icon file type directory entry structure