Remove FX_WORD in favor of uint16_t.

core/fxcodec/codec/fx_codec_tiff.cpp

 // 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
 
 #include "core/fxcodec/codec/codec_int.h"
 #include "core/include/fxcodec/fx_codec.h"
 #include "core/include/fxge/fx_dib.h"
 
@@ skipping 267 matching lines @@
 
 FX_BOOL CCodec_TiffContext::LoadFrameInfo(int32_t frame,
                                           FX_DWORD& width,
                                           FX_DWORD& height,
                                           FX_DWORD& comps,
                                           FX_DWORD& bpc,
                                           CFX_DIBAttribute* pAttribute) {
   if (!TIFFSetDirectory(tif_ctx, (uint16)frame)) {
     return FALSE;
   }
-  FX_WORD tif_cs;
+  uint16_t tif_cs;
   FX_DWORD tif_icc_size = 0;
   uint8_t* tif_icc_buf = NULL;
-  FX_WORD tif_bpc = 0;
-  FX_WORD tif_cps;
+  uint16_t tif_bpc = 0;
+  uint16_t tif_cps;
   FX_DWORD tif_rps;
   width = height = comps = 0;
   TIFFGetField(tif_ctx, TIFFTAG_IMAGEWIDTH, &width);
   TIFFGetField(tif_ctx, TIFFTAG_IMAGELENGTH, &height);
   TIFFGetField(tif_ctx, TIFFTAG_SAMPLESPERPIXEL, &comps);
   TIFFGetField(tif_ctx, TIFFTAG_BITSPERSAMPLE, &tif_bpc);
   TIFFGetField(tif_ctx, TIFFTAG_PHOTOMETRIC, &tif_cs);
   TIFFGetField(tif_ctx, TIFFTAG_COMPRESSION, &tif_cps);
   TIFFGetField(tif_ctx, TIFFTAG_ROWSPERSTRIP, &tif_rps);
   TIFFGetField(tif_ctx, TIFFTAG_ICCPROFILE, &tif_icc_size, &tif_icc_buf);
   if (pAttribute) {
     pAttribute->m_wDPIUnit = FXCODEC_RESUNIT_INCH;
     if (TIFFGetField(tif_ctx, TIFFTAG_RESOLUTIONUNIT,
                      &pAttribute->m_wDPIUnit)) {
       pAttribute->m_wDPIUnit -= 1;
     }
-    Tiff_Exif_GetInfo<FX_WORD>(tif_ctx, TIFFTAG_ORIENTATION, pAttribute);
+    Tiff_Exif_GetInfo<uint16_t>(tif_ctx, TIFFTAG_ORIENTATION, pAttribute);
     if (Tiff_Exif_GetInfo<FX_FLOAT>(tif_ctx, TIFFTAG_XRESOLUTION, pAttribute)) {
       void* val = pAttribute->m_Exif[TIFFTAG_XRESOLUTION];
       FX_FLOAT fDpi = val ? *reinterpret_cast<FX_FLOAT*>(val) : 0;
       pAttribute->m_nXDPI = (int32_t)(fDpi + 0.5f);
     }
     if (Tiff_Exif_GetInfo<FX_FLOAT>(tif_ctx, TIFFTAG_YRESOLUTION, pAttribute)) {
       void* val = pAttribute->m_Exif[TIFFTAG_YRESOLUTION];
       FX_FLOAT fDpi = val ? *reinterpret_cast<FX_FLOAT*>(val) : 0;
       pAttribute->m_nYDPI = (int32_t)(fDpi + 0.5f);
     }
@@ skipping 160 matching lines @@
   FX_DWORD img_wid = pDIBitmap->GetWidth();
   FX_DWORD img_hei = pDIBitmap->GetHeight();
   FX_DWORD width = 0;
   FX_DWORD height = 0;
   TIFFGetField(tif_ctx, TIFFTAG_IMAGEWIDTH, &width);
   TIFFGetField(tif_ctx, TIFFTAG_IMAGELENGTH, &height);
   if (img_wid != width || img_hei != height) {
     return FALSE;
   }
   if (pDIBitmap->GetBPP() == 32) {
-    FX_WORD rotation = ORIENTATION_TOPLEFT;
+    uint16_t rotation = ORIENTATION_TOPLEFT;
     TIFFGetField(tif_ctx, TIFFTAG_ORIENTATION, &rotation);
     if (TIFFReadRGBAImageOriented(tif_ctx, img_wid, img_hei,
                                   (uint32*)pDIBitmap->GetBuffer(), rotation,
                                   1)) {
       for (FX_DWORD row = 0; row < img_hei; row++) {
         uint8_t* row_buf = (uint8_t*)pDIBitmap->GetScanline(row);
         _TiffBGRA2RGBA(row_buf, img_wid, 4);
       }
       return TRUE;
     }
@@ skipping 34 matching lines @@
   return pDecoder->LoadFrameInfo(frame, width, height, comps, bpc, pAttribute);
 }
 FX_BOOL CCodec_TiffModule::Decode(void* ctx, class CFX_DIBitmap* pDIBitmap) {
   CCodec_TiffContext* pDecoder = (CCodec_TiffContext*)ctx;
   return pDecoder->Decode(pDIBitmap);
 }
 void CCodec_TiffModule::DestroyDecoder(void* ctx) {
   CCodec_TiffContext* pDecoder = (CCodec_TiffContext*)ctx;
   delete pDecoder;
 }