Merge to XFA: Use stdint.h types throughout PDFium.

fpdfsdk/src/fxedit/fxet_ap.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 "../../include/fxedit/fxet_stub.h"
 #include "../../include/fxedit/fx_edit.h"
 #include "../../include/fxedit/fxet_edit.h"
 
-CFX_ByteString GetPDFWordString(IFX_Edit_FontMap * pFontMap, FX_INT32 nFontIndex, FX_WORD Word, FX_WORD SubWord) 
+CFX_ByteString GetPDFWordString(IFX_Edit_FontMap * pFontMap, int32_t nFontIndex, FX_WORD Word, FX_WORD SubWord) 
 {
         ASSERT (pFontMap != NULL);
 
         CFX_ByteString sWord;
 
         if (CPDF_Font * pPDFFont = pFontMap->GetPDFFont(nFontIndex))
         {
                 if (SubWord > 0)
                 {
                         Word = SubWord;         
@@ skipping 21 matching lines @@
 }
 
 static CFX_ByteString GetWordRenderString(const CFX_ByteString & strWords)
 {
         if (strWords.GetLength() > 0)
                 return PDF_EncodeString(strWords) + " Tj\n";
 
         return "";
 }
 
-static CFX_ByteString GetFontSetString(IFX_Edit_FontMap * pFontMap, FX_INT32 nFontIndex, FX_FLOAT fFontSize)
+static CFX_ByteString GetFontSetString(IFX_Edit_FontMap * pFontMap, int32_t nFontIndex, FX_FLOAT fFontSize)
 {
         CFX_ByteTextBuf sRet;
 
         if (pFontMap)
         {
                 CFX_ByteString sFontAlias = pFontMap->GetPDFFontAlias(nFontIndex);
 
                 if (sFontAlias.GetLength() > 0 && fFontSize > 0 )
                         sRet << "/" << sFontAlias << " " << fFontSize << " Tf\n";
         }
 
         return sRet.GetByteString();
 }
 
 CFX_ByteString IFX_Edit::GetEditAppearanceStream(IFX_Edit* pEdit, const CPDF_Point & ptOffset, 
                                                                                                  const CPVT_WordRange * pRange /* = NULL*/, FX_BOOL bContinuous/* = TRUE*/, FX_WORD SubWord/* = 0*/)
 {
         CFX_ByteTextBuf sEditStream, sWords;
 
         CPDF_Point ptOld(0.0f,0.0f),ptNew(0.0f,0.0f);
-        FX_INT32 nCurFontIndex = -1;
+        int32_t nCurFontIndex = -1;
 
         if (IFX_Edit_Iterator* pIterator = pEdit->GetIterator())
         {
                 if (pRange)
                         pIterator->SetAt(pRange->BeginPos);
                 else
                         pIterator->SetAt(0);
 
                 CPVT_WordPlace oldplace;
 
@@ skipping 79 matching lines @@
                 if (sWords.GetSize() > 0)
                 {
                         sEditStream << GetWordRenderString(sWords.GetByteString());
                         sWords.Clear();
                 }
         }
 
         CFX_ByteTextBuf sAppStream;
         if (sEditStream.GetSize() > 0)
         {
-                FX_INT32 nHorzScale = pEdit->GetHorzScale();
+                int32_t nHorzScale = pEdit->GetHorzScale();
                 if (nHorzScale != 100)
                 {
                         sAppStream << nHorzScale << " Tz\n";
                 }
 
                 FX_FLOAT fCharSpace = pEdit->GetCharSpace();
                 if (!FX_EDIT_IsFloatZero(fCharSpace))
                 {
                         sAppStream << fCharSpace << " Tc\n";
                 }
@@ skipping 31 matching lines @@
                                         sRet << word.ptWord.x + ptOffset.x << " " << line.ptLine.y + line.fLineDescent
                                                 << " " << word.fWidth << " " << line.fLineAscent - line.fLineDescent << " re\nf\n";                             
                                 }
                         }
                 }
         }
 
         return sRet.GetByteString();
 }