Remove FX_WORD in favor of uint16_t.

core/fxcodec/lbmp/fx_bmp.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_LBMP_FX_BMP_H_
 #define CORE_FXCODEC_LBMP_FX_BMP_H_
 
 #include <setjmp.h>
@@ skipping 17 matching lines @@
 #define RLE_DELTA 2
 #define BMP_RGB 0L
 #define BMP_RLE8 1L
 #define BMP_RLE4 2L
 #define BMP_BITFIELDS 3L
 #define BMP_BIT_555 0
 #define BMP_BIT_565 1
 #define BMP_MAX_ERROR_SIZE 256
 #pragma pack(1)
 typedef struct tagBmpFileHeader {
-  FX_WORD bfType;
+  uint16_t bfType;
   FX_DWORD bfSize;
-  FX_WORD bfReserved1;
-  FX_WORD bfReserved2;
+  uint16_t bfReserved1;
+  uint16_t bfReserved2;
   FX_DWORD bfOffBits;
 } BmpFileHeader, *BmpFileHeaderPtr;
 typedef struct tagBmpCoreHeader {
   FX_DWORD bcSize;
-  FX_WORD bcWidth;
-  FX_WORD bcHeight;
-  FX_WORD bcPlanes;
-  FX_WORD bcBitCount;
+  uint16_t bcWidth;
+  uint16_t bcHeight;
+  uint16_t bcPlanes;
+  uint16_t bcBitCount;
 } BmpCoreHeader, *BmpCoreHeaderPtr;
 typedef struct tagBmpInfoHeader {
   FX_DWORD biSize;
   int32_t biWidth;
   int32_t biHeight;
-  FX_WORD biPlanes;
-  FX_WORD biBitCount;
+  uint16_t biPlanes;
+  uint16_t biBitCount;
   FX_DWORD biCompression;
   FX_DWORD biSizeImage;
   int32_t biXPelsPerMeter;
   int32_t biYPelsPerMeter;
   FX_DWORD biClrUsed;
   FX_DWORD biClrImportant;
 } BmpInfoHeader, *BmpInfoHeaderPtr;
 #pragma pack()
 
 typedef struct tag_bmp_decompress_struct bmp_decompress_struct;
 typedef bmp_decompress_struct* bmp_decompress_struct_p;
 typedef bmp_decompress_struct_p* bmp_decompress_struct_pp;
 struct tag_bmp_decompress_struct {
   jmp_buf jmpbuf;
   FX_CHAR* err_ptr;
   void (*bmp_error_fn)(bmp_decompress_struct_p gif_ptr, const FX_CHAR* err_msg);
 
   void* context_ptr;
 
   BmpFileHeaderPtr bmp_header_ptr;
   BmpInfoHeaderPtr bmp_infoheader_ptr;
   int32_t width;
   int32_t height;
   FX_DWORD compress_flag;
   int32_t components;
   int32_t src_row_bytes;
   int32_t out_row_bytes;
   uint8_t* out_row_buffer;
-  FX_WORD bitCounts;
+  uint16_t bitCounts;
   FX_DWORD color_used;
   FX_BOOL imgTB_flag;
   int32_t pal_num;
   int32_t pal_type;
   FX_DWORD* pal_ptr;
   FX_DWORD data_size;
   FX_DWORD img_data_offset;
   FX_DWORD img_ifh_size;
   int32_t row_num;
   int32_t col_num;
@@ skipping 36 matching lines @@
 struct tag_bmp_compress_struct {
   BmpFileHeader file_header;
   BmpInfoHeader info_header;
   uint8_t* src_buf;
   FX_DWORD src_pitch;
   FX_DWORD src_row;
   uint8_t src_bpp;
   FX_DWORD src_width;
   FX_BOOL src_free;
   FX_DWORD* pal_ptr;
-  FX_WORD pal_num;
+  uint16_t pal_num;
   uint8_t bit_type;
 };
 
 bmp_compress_struct_p bmp_create_compress();
 void bmp_destroy_compress(bmp_compress_struct_p bmp_ptr);
 FX_BOOL bmp_encode_image(bmp_compress_struct_p bmp_ptr,
                          uint8_t*& dst_buf,
                          FX_DWORD& dst_size);
 
-FX_WORD GetWord_LSBFirst(uint8_t* p);
-void SetWord_LSBFirst(uint8_t* p, FX_WORD v);
+uint16_t GetWord_LSBFirst(uint8_t* p);
+void SetWord_LSBFirst(uint8_t* p, uint16_t v);
 
 #endif  // CORE_FXCODEC_LBMP_FX_BMP_H_