Cleanup CGifDecompressor part 2

Change-Id: I9754da8d1bf54b328761ac9d83fcc4a3518b4a73
Reviewed-on: https://pdfium-review.googlesource.com/5230
Reviewed-by: dsinclair <dsinclair@chromium.org>
Commit-Queue: Nicolás Peña <npm@chromium.org>

1 files changed, 15 insertions, 15 deletions

diff --git a/core/fxcodec/lgif/fx_gif.h b/core/fxcodec/lgif/fx_gif.h
index 58dad203d1..7bae79f245 100644
--- a/core/fxcodec/lgif/fx_gif.h
+++ b/core/fxcodec/lgif/fx_gif.h
@@ -8,6 +8,7 @@
 #define CORE_FXCODEC_LGIF_FX_GIF_H_
 
 #include <setjmp.h>
+#include <memory>
 #include <vector>
 
 #include "core/fxcrt/fx_basic.h"
@@ -101,21 +102,6 @@ typedef struct tagGifAE {
 } GifAE;
 typedef struct tagGifPalette { uint8_t r, g, b; } GifPalette;
 #pragma pack()
-typedef struct tagGifImage {
-  GifGCE* image_gce_ptr;
-  GifPalette* local_pal_ptr;
-  GifImageInfo* image_info_ptr;
-  uint8_t image_code_size;
-  uint32_t image_data_pos;
-  uint8_t* image_row_buf;
-  int32_t image_row_num;
-} GifImage;
-
-typedef struct tagGifPlainText {
-  GifGCE* gce_ptr;
-  GifPTE* pte_ptr;
-  CFX_ByteString* string_ptr;
-} GifPlainText;
 
 enum class GifDecodeStatus {
   Error,
@@ -124,6 +110,20 @@ enum class GifDecodeStatus {
   InsufficientDestSize,  // Only used internally by CGifLZWDecoder::Decode()
 };
 
+class GifImage {
+ public:
+  GifImage();
+  ~GifImage();
+
+  std::unique_ptr<GifGCE> m_ImageGCE;
+  std::vector<GifPalette> m_LocalPalettes;
+  std::vector<uint8_t> m_ImageRowBuf;
+  GifImageInfo m_ImageInfo;
+  uint8_t image_code_size;
+  uint32_t image_data_pos;
+  int32_t image_row_num;
+};
+
 class CGifLZWDecoder {
  public:
   struct tag_Table {