From 62a70f90c49cf7714c960186eb063ad55333e6f3 Mon Sep 17 00:00:00 2001
From: Tom Sepez <tsepez@chromium.org>
Date: Mon, 21 Mar 2016 15:00:20 -0700
Subject: Remove FX_WORD in favor of uint16_t.

It isn't buying us anthing, and it looks strange in
a struct when other uint types are already present.

R=dsinclair@chromium.org

Review URL: https://codereview.chromium.org/1821043003 .
---
 core/fxcodec/jbig2/JBig2_BitStream.cpp | 2 +-
 core/fxcodec/jbig2/JBig2_BitStream.h   | 2 +-
 core/fxcodec/jbig2/JBig2_Context.cpp   | 8 ++++----
 core/fxcodec/jbig2/JBig2_GrdProc.h     | 2 +-
 core/fxcodec/jbig2/JBig2_HtrdProc.h    | 4 ++--
 core/fxcodec/jbig2/JBig2_Page.h        | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'core/fxcodec/jbig2')

diff --git a/core/fxcodec/jbig2/JBig2_BitStream.cpp b/core/fxcodec/jbig2/JBig2_BitStream.cpp
index a2a4c2c7c0..4ca4be16d4 100644
--- a/core/fxcodec/jbig2/JBig2_BitStream.cpp
+++ b/core/fxcodec/jbig2/JBig2_BitStream.cpp
@@ -101,7 +101,7 @@ int32_t CJBig2_BitStream::readInteger(FX_DWORD* dwResult) {
   return 0;
 }
 
-int32_t CJBig2_BitStream::readShortInteger(FX_WORD* dwResult) {
+int32_t CJBig2_BitStream::readShortInteger(uint16_t* dwResult) {
   if (m_dwByteIdx + 1 >= m_dwLength)
     return -1;
 
diff --git a/core/fxcodec/jbig2/JBig2_BitStream.h b/core/fxcodec/jbig2/JBig2_BitStream.h
index c24fedfba1..37b18b53a3 100644
--- a/core/fxcodec/jbig2/JBig2_BitStream.h
+++ b/core/fxcodec/jbig2/JBig2_BitStream.h
@@ -23,7 +23,7 @@ class CJBig2_BitStream {
   int32_t read1Bit(FX_BOOL* bResult);
   int32_t read1Byte(uint8_t* cResult);
   int32_t readInteger(FX_DWORD* dwResult);
-  int32_t readShortInteger(FX_WORD* wResult);
+  int32_t readShortInteger(uint16_t* wResult);
   void alignByte();
   uint8_t getCurByte() const;
   void incByteIdx();
diff --git a/core/fxcodec/jbig2/JBig2_Context.cpp b/core/fxcodec/jbig2/JBig2_Context.cpp
index 7060f3522b..da020a6a75 100644
--- a/core/fxcodec/jbig2/JBig2_Context.cpp
+++ b/core/fxcodec/jbig2/JBig2_Context.cpp
@@ -302,7 +302,7 @@ int32_t CJBig2_Context::parseSegmentHeader(CJBig2_Segment* pSegment) {
           pSegment->m_pReferred_to_segment_numbers[i] = cTemp;
           break;
         case 2:
-          FX_WORD wTemp;
+          uint16_t wTemp;
           if (m_pStream->readShortInteger(&wTemp) != 0)
             return JBIG2_ERROR_TOO_SHORT;
 
@@ -379,7 +379,7 @@ int32_t CJBig2_Context::ProcessingParseSegmentData(CJBig2_Segment* pSegment,
         return JBIG2_ERROR_FATAL;
       return parseGenericRefinementRegion(pSegment);
     case 48: {
-      FX_WORD wTemp;
+      uint16_t wTemp;
       std::unique_ptr<JBig2PageInfo> pPageInfo(new JBig2PageInfo);
       if (m_pStream->readInteger(&pPageInfo->m_dwWidth) != 0 ||
           m_pStream->readInteger(&pPageInfo->m_dwHeight) != 0 ||
@@ -435,7 +435,7 @@ int32_t CJBig2_Context::ProcessingParseSegmentData(CJBig2_Segment* pSegment,
 
 int32_t CJBig2_Context::parseSymbolDict(CJBig2_Segment* pSegment,
                                         IFX_Pause* pPause) {
-  FX_WORD wFlags;
+  uint16_t wFlags;
   if (m_pStream->readShortInteger(&wFlags) != 0)
     return JBIG2_ERROR_TOO_SHORT;
 
@@ -653,7 +653,7 @@ int32_t CJBig2_Context::parseSymbolDict(CJBig2_Segment* pSegment,
 }
 
 int32_t CJBig2_Context::parseTextRegion(CJBig2_Segment* pSegment) {
-  FX_WORD wFlags;
+  uint16_t wFlags;
   JBig2RegionInfo ri;
   if (parseRegionInfo(&ri) != JBIG2_SUCCESS ||
       m_pStream->readShortInteger(&wFlags) != 0) {
diff --git a/core/fxcodec/jbig2/JBig2_GrdProc.h b/core/fxcodec/jbig2/JBig2_GrdProc.h
index 2a181b1822..9d7f8b0221 100644
--- a/core/fxcodec/jbig2/JBig2_GrdProc.h
+++ b/core/fxcodec/jbig2/JBig2_GrdProc.h
@@ -116,7 +116,7 @@ class CJBig2_GRDProc {
   CJBig2_Image** m_pImage;
   CJBig2_ArithDecoder* m_pArithDecoder;
   JBig2ArithCtx* m_gbContext;
-  FX_WORD m_DecodeType;
+  uint16_t m_DecodeType;
   FX_BOOL LTP;
   FX_RECT m_ReplaceRect;
 };
diff --git a/core/fxcodec/jbig2/JBig2_HtrdProc.h b/core/fxcodec/jbig2/JBig2_HtrdProc.h
index 583145b5ca..7766ce6d46 100644
--- a/core/fxcodec/jbig2/JBig2_HtrdProc.h
+++ b/core/fxcodec/jbig2/JBig2_HtrdProc.h
@@ -37,8 +37,8 @@ class CJBig2_HTRDProc {
   FX_DWORD HGH;
   int32_t HGX;
   int32_t HGY;
-  FX_WORD HRX;
-  FX_WORD HRY;
+  uint16_t HRX;
+  uint16_t HRY;
   uint8_t HPW;
   uint8_t HPH;
 };
diff --git a/core/fxcodec/jbig2/JBig2_Page.h b/core/fxcodec/jbig2/JBig2_Page.h
index b3e09d8ae0..81800ba2d4 100644
--- a/core/fxcodec/jbig2/JBig2_Page.h
+++ b/core/fxcodec/jbig2/JBig2_Page.h
@@ -16,7 +16,7 @@ struct JBig2PageInfo {
   FX_DWORD m_dwResolutionY;
   uint8_t m_cFlags;
   FX_BOOL m_bIsStriped;
-  FX_WORD m_wMaxStripeSize;
+  uint16_t m_wMaxStripeSize;
 };
 
 #endif  // CORE_FXCODEC_JBIG2_JBIG2_PAGE_H_
-- 
cgit v1.2.3