From 6655d95a8586c1f272d5d418bb63514abbe1d695 Mon Sep 17 00:00:00 2001
From: Tom Sepez <tsepez@chromium.org>
Date: Fri, 10 Aug 2018 17:41:29 +0000
Subject: 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>
---
 core/fxcodec/bmp/fx_bmp.h              | 14 ++++++++------
 core/fxcodec/gif/cfx_gif.cpp           |  4 ++++
 core/fxcodec/gif/cfx_gif.h             |  7 +++++--
 core/fxcodec/gif/cfx_lzwdecompressor.h |  4 ++--
 4 files changed, 19 insertions(+), 10 deletions(-)

(limited to 'core/fxcodec')

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_
diff --git a/core/fxcodec/gif/cfx_gif.cpp b/core/fxcodec/gif/cfx_gif.cpp
index 18d474ba9a..efe4f4b03a 100644
--- a/core/fxcodec/gif/cfx_gif.cpp
+++ b/core/fxcodec/gif/cfx_gif.cpp
@@ -29,3 +29,7 @@ static_assert(sizeof(GifApplicationExtension) == 12,
               "GifApplicationExtension should have a size of 12");
 static_assert(sizeof(CFX_GifPalette) == 3,
               "CFX_GifPalette should have a size of 3");
+
+CFX_GifImage::CFX_GifImage() = default;
+
+CFX_GifImage::~CFX_GifImage() = default;
diff --git a/core/fxcodec/gif/cfx_gif.h b/core/fxcodec/gif/cfx_gif.h
index dd0d719bcf..9ca7211997 100644
--- a/core/fxcodec/gif/cfx_gif.h
+++ b/core/fxcodec/gif/cfx_gif.h
@@ -116,7 +116,10 @@ enum class CFX_GifDecodeStatus {
   InsufficientDestSize,  // Only used internally by CGifLZWDecoder::Decode()
 };
 
-typedef struct {
+struct CFX_GifImage {
+  CFX_GifImage();
+  ~CFX_GifImage();
+
   std::unique_ptr<CFX_GifGraphicControlExtension> image_GCE;
   std::vector<CFX_GifPalette> local_palettes;
   std::vector<uint8_t> row_buffer;
@@ -125,6 +128,6 @@ typedef struct {
   uint8_t code_exp;
   uint32_t data_pos;
   int32_t row_num;
-} CFX_GifImage;
+};
 
 #endif  // CORE_FXCODEC_GIF_CFX_GIF_H_
diff --git a/core/fxcodec/gif/cfx_lzwdecompressor.h b/core/fxcodec/gif/cfx_lzwdecompressor.h
index f4df065e34..d3ec588de1 100644
--- a/core/fxcodec/gif/cfx_lzwdecompressor.h
+++ b/core/fxcodec/gif/cfx_lzwdecompressor.h
@@ -14,10 +14,10 @@
 
 class CFX_LZWDecompressor {
  public:
-  typedef struct {
+  struct CodeEntry {
     uint16_t prefix;
     uint8_t suffix;
-  } CodeEntry;
+  };
 
   // Returns nullptr on error
   static std::unique_ptr<CFX_LZWDecompressor> Create(uint8_t color_exp,
-- 
cgit v1.2.3