Changeset 85856 in vbox for trunk/include

Timestamp:

Aug 21, 2020 9:06:50 AM (4 years ago)

Author:

vboxsync

Message:

Consolidated all the different Bitmap (BMP) file format headers / definitions into new include/iprt/formats/bmp.h (part 1).

Location:

trunk/include

Files:

• VBox/GuestHost/clipboard-helper.h (modified) (1 diff)
• iprt/formats/bmp.h (added)

trunk/include/VBox/GuestHost/clipboard-helper.h

@@ -165 +165 @@
 int ShClConvLatin1LFToUtf16CRLF(const char *pcszSrc, size_t cbSrc, PRTUTF16 *ppwszDst, size_t *pcwDst);
 
-#pragma pack(1)
-/** @todo r=bird: Why duplicate these structures here, we've got them in
- *        DevVGA.cpp already! */
-/**
- * Bitmap File Header. Official win32 name is BITMAPFILEHEADER
- * Always Little Endian.
- */
-typedef struct BMFILEHEADER
-{
-    uint16_t uType;
-    uint32_t uSize;
-    uint16_t uReserved1;
-    uint16_t uReserved2;
-    uint32_t uOffBits;
-} BMFILEHEADER;
-#pragma pack()
-
-/** Pointer to a BMFILEHEADER structure. */
-typedef BMFILEHEADER *PBMFILEHEADER;
-/** BMP file magic number */
-#define BITMAPHEADERMAGIC (RT_H2LE_U16_C(0x4d42))
-
-/**
- * Bitmap Info Header. Official win32 name is BITMAPINFOHEADER
- * Always Little Endian.
- */
-typedef struct BMINFOHEADER
-{
-    uint32_t uSize;
-    uint32_t uWidth;
-    uint32_t uHeight;
-    uint16_t uPlanes;
-    uint16_t uBitCount;
-    uint32_t uCompression;
-    uint32_t uSizeImage;
-    uint32_t uXBitsPerMeter;
-    uint32_t uYBitsPerMeter;
-    uint32_t uClrUsed;
-    uint32_t uClrImportant;
-} BMINFOHEADER;
-/** Pointer to a BMINFOHEADER structure. */
-typedef BMINFOHEADER *PBMINFOHEADER;
-
 /**
  * Convert CF_DIB data to full BMP data by prepending the BM header.