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

fpdfsdk/src/fxedit/fxet_pageobjs.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"
 
 #define FX_EDIT_UNDERLINEHALFWIDTH                              0.5f
 #define FX_EDIT_CROSSOUTHALFWIDTH                               0.5f
 
-extern CFX_ByteString GetPDFWordString(IFX_Edit_FontMap * pFontMap, FX_INT32 nFontIndex, FX_WORD Word, FX_WORD SubWord);
+extern CFX_ByteString GetPDFWordString(IFX_Edit_FontMap * pFontMap, int32_t nFontIndex, FX_WORD Word, FX_WORD SubWord);
 
 CPDF_Rect GetUnderLineRect(const CPVT_Word& word)
 {
         return CPDF_Rect(word.ptWord.x, word.ptWord.y + word.fDescent * 0.5f,
                                                 word.ptWord.x + word.fWidth, word.ptWord.y + word.fDescent * 0.25f);
 }
 
 CPDF_Rect GetCrossoutRect(const CPVT_Word& word)
 {
         return CPDF_Rect(word.ptWord.x, word.ptWord.y + (word.fAscent + word.fDescent) * 0.5f + word.fDescent * 0.25f,
                                                         word.ptWord.x + word.fWidth, word.ptWord.y + (word.fAscent + word.fDescent) * 0.5f);
 }
 
 static void DrawTextString(CFX_RenderDevice* pDevice, const CPDF_Point& pt, CPDF_Font* pFont, FX_FLOAT fFontSize, CPDF_Matrix* pUser2Device,
-                                          const CFX_ByteString& str, FX_ARGB crTextFill, FX_ARGB crTextStroke, FX_INT32 nHorzScale)
+                                          const CFX_ByteString& str, FX_ARGB crTextFill, FX_ARGB crTextStroke, int32_t nHorzScale)
 {
         FX_FLOAT x = pt.x, y = pt.y;
         pUser2Device->Transform(x, y);
 
         if (pFont)
         {
                 if (nHorzScale != 100)
                 {
                         CPDF_Matrix mt(nHorzScale/100.0f,0,0,1,0,0);
                         mt.Concat(*pUser2Device);
@@ skipping 40 matching lines @@
 void IFX_Edit::DrawUnderline(CFX_RenderDevice* pDevice, CPDF_Matrix* pUser2Device, IFX_Edit* pEdit, FX_COLORREF color,
                                                                 const CPDF_Rect& rcClip, const CPDF_Point& ptOffset, const CPVT_WordRange* pRange)
 {
         pDevice->SaveState();
 
         if (!rcClip.IsEmpty())
         {
                 CPDF_Rect rcTemp = rcClip;
                 pUser2Device->TransformRect(rcTemp);
                 FX_RECT rcDevClip;
-                rcDevClip.left = (FX_INT32)rcTemp.left;
-                rcDevClip.right = (FX_INT32)rcTemp.right;
-                rcDevClip.top = (FX_INT32)rcTemp.top;
-                rcDevClip.bottom = (FX_INT32)rcTemp.bottom;
+                rcDevClip.left = (int32_t)rcTemp.left;
+                rcDevClip.right = (int32_t)rcTemp.right;
+                rcDevClip.top = (int32_t)rcTemp.top;
+                rcDevClip.bottom = (int32_t)rcTemp.bottom;
                 pDevice->SetClip_Rect(&rcDevClip);
         }
 
         if (IFX_Edit_Iterator* pIterator = pEdit->GetIterator())
         {
                 if (pEdit->GetFontMap())
                 {
                         if (pRange)
                                 pIterator->SetAt(pRange->BeginPos);
                         else
@@ skipping 28 matching lines @@
                                                 const CPDF_Rect& rcClip, const CPDF_Point& ptOffset, const CPVT_WordRange* pRange, IFX_SystemHandler* pSystemHandler, void* pFFLData)
 {
         
         FX_BOOL bContinuous = pEdit->GetCharArray() == 0;
         if (pEdit->GetCharSpace() > 0.0f)
                 bContinuous = FALSE;
 
         FX_WORD SubWord = pEdit->GetPasswordChar();
         FX_FLOAT fFontSize = pEdit->GetFontSize();
         CPVT_WordRange wrSelect = pEdit->GetSelectWordRange();
-        FX_INT32 nHorzScale = pEdit->GetHorzScale();
+        int32_t nHorzScale = pEdit->GetHorzScale();
 
         FX_COLORREF crCurFill = crTextFill;
         FX_COLORREF crOldFill = crCurFill;
 
         FX_BOOL bSelect = FALSE;
         const FX_COLORREF crWhite = ArgbEncode(255,255,255,255);
         const FX_COLORREF crSelBK = ArgbEncode(255,0,51,113);
 
         CFX_ByteTextBuf sTextBuf;
-        FX_INT32 nFontIndex = -1;
+        int32_t nFontIndex = -1;
         CPDF_Point ptBT(0.0f,0.0f);
 
         pDevice->SaveState();
 
         if (!rcClip.IsEmpty())
         {
                 CPDF_Rect rcTemp = rcClip;
                 pUser2Device->TransformRect(rcTemp);
                 FX_RECT rcDevClip;
-                rcDevClip.left = (FX_INT32)rcTemp.left;
-                rcDevClip.right = (FX_INT32)rcTemp.right;
-                rcDevClip.top = (FX_INT32)rcTemp.top;
-                rcDevClip.bottom = (FX_INT32)rcTemp.bottom;
+                rcDevClip.left = (int32_t)rcTemp.left;
+                rcDevClip.right = (int32_t)rcTemp.right;
+                rcDevClip.top = (int32_t)rcTemp.top;
+                rcDevClip.bottom = (int32_t)rcTemp.bottom;
                 pDevice->SetClip_Rect(&rcDevClip);
         }
 
         if (IFX_Edit_Iterator* pIterator = pEdit->GetIterator())
         {
                 if (IFX_Edit_FontMap* pFontMap = pEdit->GetFontMap())
                 {
                         if (pRange)
                                 pIterator->SetAt(pRange->BeginPos);
                         else
@@ skipping 110 matching lines @@
         CPVT_WordProps wp;
         CPDF_Point ptBT(0.0f,0.0f);
 
         pDevice->SaveState();
 
         if (!rcClip.IsEmpty())
         {
                 CPDF_Rect rcTemp = rcClip;
                 pUser2Device->TransformRect(rcTemp);
                 FX_RECT rcDevClip;
-                rcDevClip.left = (FX_INT32)rcTemp.left;
-                rcDevClip.right = (FX_INT32)rcTemp.right;
-                rcDevClip.top = (FX_INT32)rcTemp.top;
-                rcDevClip.bottom = (FX_INT32)rcTemp.bottom;
+                rcDevClip.left = (int32_t)rcTemp.left;
+                rcDevClip.right = (int32_t)rcTemp.right;
+                rcDevClip.top = (int32_t)rcTemp.top;
+                rcDevClip.bottom = (int32_t)rcTemp.bottom;
                 pDevice->SetClip_Rect(&rcDevClip);
         }
 
         if (IFX_Edit_Iterator* pIterator = pEdit->GetIterator())
         {
                 if (IFX_Edit_FontMap* pFontMap = pEdit->GetFontMap())
                 {
                         if (pRange)
                                 pIterator->SetAt(pRange->BeginPos);
                         else
@@ skipping 99 matching lines @@
         rgb[2] = FXARGB_B(crFill) / 255.0f;
         pPathObj->m_ColorState.SetFillColor(CPDF_ColorSpace::GetStockCS(PDFCS_DEVICERGB), rgb, 3);
 
         pPathObj->m_FillType = FXFILL_ALTERNATE;
         pPathObj->m_bStroke = FALSE;
 
         pPageObjs->InsertObject(pPageObjs->GetLastObjectPosition(),pPathObj);
 }
 
 static CPDF_TextObject* AddTextObjToPageObjects(CPDF_PageObjects* pPageObjs, FX_COLORREF crText, 
-                                                         CPDF_Font* pFont, FX_FLOAT fFontSize, FX_FLOAT fCharSpace, FX_INT32 nHorzScale, 
+                                                         CPDF_Font* pFont, FX_FLOAT fFontSize, FX_FLOAT fCharSpace, int32_t nHorzScale, 
                                                          const CPDF_Point& point, const CFX_ByteString& text)
 {
         CPDF_TextObject* pTxtObj = new CPDF_TextObject;
                         
         CPDF_TextStateData* pTextStateData = pTxtObj->m_TextState.GetModify();
         pTextStateData->m_pFont = pFont;
         pTextStateData->m_FontSize = fFontSize;
         pTextStateData->m_CharSpace = fCharSpace;
         pTextStateData->m_WordSpace = 0;
         pTextStateData->m_TextMode  = 0;
@@ skipping 15 matching lines @@
         pPageObjs->InsertObject(pPageObjs->GetLastObjectPosition(),pTxtObj);
 
         return pTxtObj;
 }
 
 void IFX_Edit::GeneratePageObjects(CPDF_PageObjects* pPageObjects, IFX_Edit* pEdit,
                                                                    const CPDF_Point& ptOffset, const CPVT_WordRange* pRange, FX_COLORREF crText, CFX_ArrayTemplate<CPDF_TextObject*>& ObjArray)
 {
         FX_FLOAT fFontSize = pEdit->GetFontSize();
 
-        FX_INT32 nOldFontIndex = -1;
+        int32_t nOldFontIndex = -1;
 
         CFX_ByteTextBuf sTextBuf;
         CPDF_Point ptBT(0.0f,0.0f);
 
         ObjArray.RemoveAll();
 
         if (IFX_Edit_Iterator* pIterator = pEdit->GetIterator())
         {
                 if (IFX_Edit_FontMap* pFontMap = pEdit->GetFontMap())
                 {
@@ skipping 166 matching lines @@
                                         rcUnderline.right += ptOffset.x;
                                         rcUnderline.top += ptOffset.y;
                                         rcUnderline.bottom += ptOffset.y;
                                         AddRectToPageObjects(pPageObjects, color, rcUnderline);
                                 }
                         }
                 }
         }
 }