summaryrefslogtreecommitdiff
path: root/core/fxcodec/bmp/fx_bmp.h
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2018-08-10 17:41:29 +0000
committerChromium commit bot <commit-bot@chromium.org>2018-08-10 17:41:29 +0000
commit6655d95a8586c1f272d5d418bb63514abbe1d695 (patch)
tree6559d283e8136f4866795087f6886e6c0ab15927 /core/fxcodec/bmp/fx_bmp.h
parentef7c9553811c8b45ada69260e9abf5d4444bcd51 (diff)
downloadpdfium-6655d95a8586c1f272d5d418bb63514abbe1d695.tar.xz
Remove |typedef struct| in favor of just |struct|.
Because I saw one in some other code and decided to hunt them all. These are all defined in C++ context, so no chance of C compatiblity. Note that such a declaration without a struct tag will bypass the [chromium-style] out-of-line constructor/destructor warnings, so add constructors/destructors where required. Change-Id: Ib821d8bc2f68ccf7028b0f73432e8e7c93a953ba Reviewed-on: https://pdfium-review.googlesource.com/39851 Commit-Queue: Tom Sepez <tsepez@chromium.org> Reviewed-by: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'core/fxcodec/bmp/fx_bmp.h')
-rw-r--r--core/fxcodec/bmp/fx_bmp.h14
1 files changed, 8 insertions, 6 deletions
diff --git a/core/fxcodec/bmp/fx_bmp.h b/core/fxcodec/bmp/fx_bmp.h
index 76177ff063..d013577416 100644
--- a/core/fxcodec/bmp/fx_bmp.h
+++ b/core/fxcodec/bmp/fx_bmp.h
@@ -30,21 +30,23 @@
// Limit width to (MAXINT32 - 31) / 32
#define BMP_MAX_WIDTH 67108863
#pragma pack(1)
-typedef struct tagBmpFileHeader {
+struct BmpFileHeader {
uint16_t bfType;
uint32_t bfSize;
uint16_t bfReserved1;
uint16_t bfReserved2;
uint32_t bfOffBits;
-} BmpFileHeader;
-typedef struct tagBmpCoreHeader {
+};
+
+struct BmpCoreHeader {
uint32_t bcSize;
uint16_t bcWidth;
uint16_t bcHeight;
uint16_t bcPlanes;
uint16_t bcBitCount;
-} BmpCoreHeader;
-typedef struct tagBmpInfoHeader {
+};
+
+struct BmpInfoHeader {
uint32_t biSize;
int32_t biWidth;
int32_t biHeight;
@@ -56,7 +58,7 @@ typedef struct tagBmpInfoHeader {
int32_t biYPelsPerMeter;
uint32_t biClrUsed;
uint32_t biClrImportant;
-} BmpInfoHeader;
+};
#pragma pack()
#endif // CORE_FXCODEC_BMP_FX_BMP_H_