Remove FX_WORD in favor of uint16_t.

fpdfsdk/fpdfppo.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 "public/fpdf_ppo.h"
 
 #include <map>
 #include <memory>
@@ skipping 10 matching lines @@
 #include "third_party/base/stl_util.h"
 
 class CPDF_PageOrganizer {
  public:
   using ObjectNumberMap = std::map<FX_DWORD, FX_DWORD>;
   CPDF_PageOrganizer();
   ~CPDF_PageOrganizer();
 
   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,
                                          CFX_ByteString nSrctag);
   FX_BOOL UpdateReference(CPDF_Object* pObj,
                           CPDF_Document* pDoc,
                           ObjectNumberMap* pObjNumberMap);
   FX_DWORD GetNewObjId(CPDF_Document* pDoc,
                        ObjectNumberMap* pObjNumberMap,
                        CPDF_Reference* pRef);
@@ skipping 47 matching lines @@
     FX_DWORD Kidsobjnum = pDestPDFDoc->AddIndirectObject(pNewKids);
 
     pNewPages->SetAt("Kids", new CPDF_Reference(pDestPDFDoc, Kidsobjnum));
     pNewPages->SetAt("Count", new CPDF_Number(0));
   }
 
   return TRUE;
 }
 
 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;
   std::unique_ptr<ObjectNumberMap> pObjNumberMap(new ObjectNumberMap);
   int nSize = pdfium::CollectionSize<int>(*pPageNums);
   for (int i = 0; i < nSize; ++i) {
     CPDF_Dictionary* pCurPageDict = pDestPDFDoc->CreateNewPage(curpage);
     CPDF_Dictionary* pSrcPageDict = pSrcPDFDoc->GetPage(pPageNums->at(i) - 1);
     if (!pSrcPageDict || !pCurPageDict)
       return FALSE;
@@ skipping 197 matching lines @@
   dwNewObjNum = pDoc->AddIndirectObject(pClone);
   (*pObjNumberMap)[dwObjnum] = dwNewObjNum;
   if (!UpdateReference(pClone, pDoc, pObjNumberMap)) {
     pClone->Release();
     return 0;
   }
   return dwNewObjNum;
 }
 
 FPDF_BOOL ParserPageRangeString(CFX_ByteString rangstring,
-                                std::vector<FX_WORD>* pageArray,
+                                std::vector<uint16_t>* pageArray,
                                 int nCount) {
   if (rangstring.GetLength() != 0) {
     rangstring.Remove(' ');
     int nLength = rangstring.GetLength();
     CFX_ByteString cbCompareString("0123456789-,");
     for (int i = 0; i < nLength; ++i) {
       if (cbCompareString.Find(rangstring[i]) == -1)
         return FALSE;
     }
     CFX_ByteString cbMidRange;
     int nStringFrom = 0;
     int nStringTo = 0;
     while (nStringTo < nLength) {
       nStringTo = rangstring.Find(',', nStringFrom);
       if (nStringTo == -1)
         nStringTo = nLength;
       cbMidRange = rangstring.Mid(nStringFrom, nStringTo - nStringFrom);
       int nMid = cbMidRange.Find('-');
       if (nMid == -1) {
         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)
           return FALSE;
 
         ++nMid;
         int nEnd = cbMidRange.GetLength() - nMid;
         if (nEnd == 0)
           return FALSE;
 
@@ skipping 17 matching lines @@
                                              FPDF_BYTESTRING pagerange,
                                              int index) {
   CPDF_Document* pDestDoc = CPDFDocumentFromFPDFDocument(dest_doc);
   if (!dest_doc)
     return FALSE;
 
   CPDF_Document* pSrcDoc = CPDFDocumentFromFPDFDocument(src_doc);
   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))
       return FALSE;
   } else {
     for (int i = 1; i <= nCount; ++i) {
       pageArray.push_back(i);
     }
   }
 
@@ skipping 17 matching lines @@
   if (!pSrcDict)
     return FALSE;
 
   CPDF_Dictionary* pDstDict = pDstDoc->GetRoot();
   if (!pDstDict)
     return FALSE;
 
   pDstDict->SetAt("ViewerPreferences", pSrcDict->Clone(TRUE));
   return TRUE;
 }