commit 62a70f90c49cf7714c960186eb063ad55333e6f3
author Tom Sepez <tsepez@chromium.org> Mon Mar 21 15:00:20 2016 -0700
committer Tom Sepez <tsepez@chromium.org> Mon Mar 21 15:00:20 2016 -0700
tree 84b5d0f70b770e6a9ec261342d46638f4d5102bd
parent 4161c5ca6c5438476bf07b6dacfafb61ea611cc5

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 .

fpdfsdk/fpdfppo.cpp

diff --git a/fpdfsdk/fpdfppo.cpp b/fpdfsdk/fpdfppo.cpp
index 6a72141..efbe8f3 100644
--- a/fpdfsdk/fpdfppo.cpp
+++ b/fpdfsdk/fpdfppo.cpp
@@ -28,7 +28,7 @@
 
   FX_BOOL PDFDocInit(CPDF_Document* pDestPDFDoc, CPDF_Document* pSrcPDFDoc);
   FX_BOOL ExportPage(CPDF_Document* pSrcPDFDoc,
-                     std::vector<FX_WORD>* pPageNums,
+                     std::vector<uint16_t>* pPageNums,
                      CPDF_Document* pDestPDFDoc,
                      int nIndex);
   CPDF_Object* PageDictGetInheritableTag(CPDF_Dictionary* pDict,
@@ -96,7 +96,7 @@
 }
 
 FX_BOOL CPDF_PageOrganizer::ExportPage(CPDF_Document* pSrcPDFDoc,
-                                       std::vector<FX_WORD>* pPageNums,
+                                       std::vector<uint16_t>* pPageNums,
                                        CPDF_Document* pDestPDFDoc,
                                        int nIndex) {
   int curpage = nIndex;
@@ -314,7 +314,7 @@
 }
 
 FPDF_BOOL ParserPageRangeString(CFX_ByteString rangstring,
-                                std::vector<FX_WORD>* pageArray,
+                                std::vector<uint16_t>* pageArray,
                                 int nCount) {
   if (rangstring.GetLength() != 0) {
     rangstring.Remove(' ');
@@ -337,7 +337,7 @@
         long lPageNum = atol(cbMidRange);
         if (lPageNum <= 0 || lPageNum > nCount)
           return FALSE;
-        pageArray->push_back((FX_WORD)lPageNum);
+        pageArray->push_back((uint16_t)lPageNum);
       } else {
         int nStartPageNum = atol(cbMidRange.Mid(0, nMid));
         if (nStartPageNum == 0)
@@ -375,7 +375,7 @@
   if (!pSrcDoc)
     return FALSE;
 
-  std::vector<FX_WORD> pageArray;
+  std::vector<uint16_t> pageArray;
   int nCount = pSrcDoc->GetPageCount();
   if (pagerange) {
     if (!ParserPageRangeString(pagerange, &pageArray, nCount))