Remove FX_WORD in favor of uint16_t.

core/fxcodec/lgif/fx_gif.h

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #ifndef CORE_FXCODEC_LGIF_FX_GIF_H_
 #define CORE_FXCODEC_LGIF_FX_GIF_H_
 
 #include <setjmp.h>
@@ skipping 34 matching lines @@
   uint8_t reserved : 2;
   uint8_t sort_flag : 1;
   uint8_t interlace : 1;
   uint8_t local_pal : 1;
 } GifLF;
 typedef struct tagGifHeader {
   char signature[3];
   char version[3];
 } GifHeader;
 typedef struct tagGifLSD {
-  FX_WORD width;
-  FX_WORD height;
+  uint16_t width;
+  uint16_t height;
   uint8_t global_flag;
   uint8_t bc_index;
   uint8_t pixel_aspect;
 } GifLSD;
 typedef struct tagGifImageInfo {
-  FX_WORD left;
-  FX_WORD top;
-  FX_WORD width;
-  FX_WORD height;
+  uint16_t left;
+  uint16_t top;
+  uint16_t width;
+  uint16_t height;
 
   uint8_t local_flag;
 } GifImageInfo;
 typedef struct tagGifCEF {
   uint8_t transparency : 1;
   uint8_t user_input : 1;
   uint8_t disposal_method : 3;
   uint8_t reserved : 3;
 } GifCEF;
 typedef struct tagGifGCE {
   uint8_t block_size;
   uint8_t gce_flag;
-  FX_WORD delay_time;
+  uint16_t delay_time;
   uint8_t trans_index;
 } GifGCE;
 typedef struct tagGifPTE {
   uint8_t block_size;
-  FX_WORD grid_left;
-  FX_WORD grid_top;
-  FX_WORD grid_width;
-  FX_WORD grid_height;
+  uint16_t grid_left;
+  uint16_t grid_top;
+  uint16_t grid_width;
+  uint16_t grid_height;
 
   uint8_t char_width;
   uint8_t char_height;
 
   uint8_t fc_index;
   uint8_t bc_index;
 } GifPTE;
 typedef struct tagGifAE {
   uint8_t block_size;
   uint8_t app_identify[8];
@@ skipping 11 matching lines @@
   int32_t image_row_num;
 } GifImage;
 typedef struct tagGifPlainText {
   GifGCE* gce_ptr;
   GifPTE* pte_ptr;
   CFX_ByteString* string_ptr;
 } GifPlainText;
 class CGifLZWDecoder {
  public:
   struct tag_Table {
-    FX_WORD prefix;
+    uint16_t prefix;
     uint8_t suffix;
   };
   CGifLZWDecoder(FX_CHAR* error_ptr = NULL) { err_msg_ptr = error_ptr; }
   void InitTable(uint8_t code_len);
 
   int32_t Decode(uint8_t* des_buf, FX_DWORD& des_size);
 
   void Input(uint8_t* src_buf, FX_DWORD src_size);
   FX_DWORD GetAvailInput();
 
  private:
   void ClearTable();
-  void AddCode(FX_WORD prefix_code, uint8_t append_char);
-  void DecodeString(FX_WORD code);
+  void AddCode(uint16_t prefix_code, uint8_t append_char);
+  void DecodeString(uint16_t code);
   uint8_t code_size;
   uint8_t code_size_cur;
-  FX_WORD code_clear;
-  FX_WORD code_end;
-  FX_WORD code_next;
+  uint16_t code_clear;
+  uint16_t code_end;
+  uint16_t code_next;
   uint8_t code_first;
   uint8_t stack[GIF_MAX_LZW_CODE];
-  FX_WORD stack_size;
+  uint16_t stack_size;
   tag_Table code_table[GIF_MAX_LZW_CODE];
-  FX_WORD code_old;
+  uint16_t code_old;
 
   uint8_t* next_in;
   FX_DWORD avail_in;
 
   uint8_t bits_left;
   FX_DWORD code_store;
 
   FX_CHAR* err_msg_ptr;
 };
 class CGifLZWEncoder {
  public:
   struct tag_Table {
-    FX_WORD prefix;
+    uint16_t prefix;
     uint8_t suffix;
   };
   CGifLZWEncoder();
   ~CGifLZWEncoder();
   void Start(uint8_t code_len,
              const uint8_t* src_buf,
              uint8_t*& dst_buf,
              FX_DWORD& offset);
   FX_BOOL Encode(const uint8_t* src_buf,
                  FX_DWORD src_len,
@@ skipping 11 matching lines @@
                     uint8_t*& dst_buf,
                     FX_DWORD& dst_len,
                     FX_DWORD& offset);
   void WriteBlock(uint8_t*& dst_buf, FX_DWORD& dst_len, FX_DWORD& offset);
   jmp_buf jmp;
   FX_DWORD src_offset;
   uint8_t src_bit_offset;
   uint8_t src_bit_cut;
   FX_DWORD src_bit_num;
   uint8_t code_size;
-  FX_WORD code_clear;
-  FX_WORD code_end;
-  FX_WORD index_num;
+  uint16_t code_clear;
+  uint16_t code_end;
+  uint16_t index_num;
   uint8_t bit_offset;
   uint8_t index_bit_cur;
   uint8_t index_buf[GIF_DATA_BLOCK];
   uint8_t index_buf_len;
   tag_Table code_table[GIF_MAX_LZW_CODE];
-  FX_WORD table_cur;
+  uint16_t table_cur;
 };
 typedef struct tag_gif_decompress_struct gif_decompress_struct;
 typedef gif_decompress_struct* gif_decompress_struct_p;
 typedef gif_decompress_struct_p* gif_decompress_struct_pp;
 static const int32_t s_gif_interlace_step[4] = {8, 8, 4, 2};
 struct tag_gif_decompress_struct {
   jmp_buf jmpbuf;
   FX_CHAR* err_ptr;
   void (*gif_error_fn)(gif_decompress_struct_p gif_ptr, const FX_CHAR* err_msg);
   void* context_ptr;
@@ skipping 38 matching lines @@
 struct tag_gif_compress_struct {
   const uint8_t* src_buf;
   FX_DWORD src_pitch;
   FX_DWORD src_width;
   FX_DWORD src_row;
   FX_DWORD cur_offset;
   FX_DWORD frames;
   GifHeader* header_ptr;
   GifLSD* lsd_ptr;
   GifPalette* global_pal;
-  FX_WORD gpal_num;
+  uint16_t gpal_num;
   GifPalette* local_pal;
-  FX_WORD lpal_num;
+  uint16_t lpal_num;
   GifImageInfo* image_info_ptr;
   CGifLZWEncoder* img_encoder_ptr;
 
   uint8_t* cmt_data_ptr;
   FX_DWORD cmt_data_len;
   GifGCE* gce_ptr;
   GifPTE* pte_ptr;
   const uint8_t* pte_data_ptr;
   FX_DWORD pte_data_len;
 };
@@ skipping 20 matching lines @@
                       uint8_t* src_buf,
                       FX_DWORD src_size);
 FX_DWORD gif_get_avail_input(gif_decompress_struct_p gif_ptr,
                              uint8_t** avial_buf_ptr);
 void interlace_buf(const uint8_t* buf, FX_DWORD width, FX_DWORD height);
 FX_BOOL gif_encode(gif_compress_struct_p gif_ptr,
                    uint8_t*& dst_buf,
                    FX_DWORD& dst_len);
 
 #endif  // CORE_FXCODEC_LGIF_FX_GIF_H_