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

core/src/reflow/reflowedpage.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/reflow/reflowengine.h"
 #include "reflowedpage.h"
 CPDF_ProgressiveReflowPageParser::CPDF_ProgressiveReflowPageParser()
 {
@@ skipping 133 matching lines @@
     }
     if (FALSE == RetainPageObjsMemberShip()) {
         return NULL;
     }
     CRF_PageInfo* pPageInfo = (CRF_PageInfo*)m_pPageInfos->GetValueAt(pObj);
     if (NULL == pPageInfo) {
         return NULL;
     }
     return pPageInfo->GetFormDict();
 }
-void CPDF_ReflowedPage::GetDisplayMatrix(CFX_AffineMatrix& matrix, FX_INT32 xPos, FX_INT32 yPos, FX_INT32 xSize, FX_INT32 ySize, FX_INT32 iRotate, const CFX_AffineMatrix* pPageMatrix)
+void CPDF_ReflowedPage::GetDisplayMatrix(CFX_AffineMatrix& matrix, int32_t xPos, int32_t yPos, int32_t xSize, int32_t ySize, int32_t iRotate, const CFX_AffineMatrix* pPageMatrix)
 {
     CFX_AffineMatrix display_matrix;
     if(m_PageHeight == 0) {
         matrix.Set(1, 0, 0, -1, 0, 0);
         return;
     }
-    FX_INT32 x0, y0, x1, y1, x2, y2;
+    int32_t x0, y0, x1, y1, x2, y2;
     iRotate %= 4;
     switch (iRotate) {
         case 0:
             x0 = xPos;
             y0 = yPos;
             x1 = xPos;
             y1 = yPos + ySize;
             x2 = xPos + xSize;
             y2 = yPos;
             break;
@@ skipping 28 matching lines @@
                        FXSYS_Div((FX_FLOAT)(y1 - y0), m_PageHeight),
                        (FX_FLOAT)(x0), (FX_FLOAT)(y0));
     matrix.Set(1.0f, 0.0f, 0.0f, -1.0f, 0.0f, 0.0f);
     matrix.Concat(display_matrix);
     return;
 }
 FX_FLOAT CPDF_ReflowedPage::GetPageHeight()
 {
     return m_PageHeight;
 }
-void CPDF_ReflowedPage::FocusGetData(const CFX_AffineMatrix matrix, FX_INT32 x, FX_INT32 y, CFX_ByteString& str)
+void CPDF_ReflowedPage::FocusGetData(const CFX_AffineMatrix matrix, int32_t x, int32_t y, CFX_ByteString& str)
 {
     if (NULL == m_pReflowed) {
         return;
     }
     CFX_AffineMatrix revMatrix;
     revMatrix.SetReverse(matrix);
     FX_FLOAT x1, y1;
     revMatrix.Transform((float)x, (float)y, x1, y1);
     int count = m_pReflowed->GetSize();
     FX_FLOAT dx = 1000, dy = 1000;
-    FX_INT32 pos = 0;
-    FX_INT32 i;
+    int32_t pos = 0;
+    int32_t i;
     for(i = 0; i < count; i++) {
         CRF_Data* pData = (*m_pReflowed)[i];
         FX_FLOAT tempdy = FXSYS_fabs(pData->m_PosY - y1);
         if(FXSYS_fabs(tempdy - dy) < 1) {
             continue;
         }
         CFX_FloatRect rect (0, pData->m_PosY + pData->m_Height, this->m_PageWidth, pData->m_PosY);
         if(rect.Contains(x1, y1)) {
             pos = i;
             dx = 0;
@@ skipping 26 matching lines @@
                 FX_FLOAT tempdx = FXSYS_fabs(pData->m_PosX - x1);
                 if(tempdx < dx) {
                     dx = tempdx;
                     pos = i;
                 }
             }
         }
     }
     str.Format("%d", pos);
 }
-FX_BOOL CPDF_ReflowedPage::FocusGetPosition(const CFX_AffineMatrix matrix, CFX_ByteString str, FX_INT32& x, FX_INT32& y)
+FX_BOOL CPDF_ReflowedPage::FocusGetPosition(const CFX_AffineMatrix matrix, CFX_ByteString str, int32_t& x, int32_t& y)
 {
     if (NULL == m_pReflowed) {
         return FALSE;
     }
-    FX_INT32 pos = FXSYS_atoi(str);
+    int32_t pos = FXSYS_atoi(str);
     if(pos < 0 || pos >= m_pReflowed->GetSize()) {
         return FALSE;
     }
     CRF_Data* pData = (*m_pReflowed)[pos];
     FX_FLOAT x1, y1;
     matrix.Transform(pData->m_PosX, pData->m_PosY + pData->m_Height, x1, y1);
     x = (int)x1;
     y = (int)y1;
     return TRUE;
 }
@@ skipping 134 matching lines @@
 }
 CPDF_ProgressiveReflowPageRender::CPDF_ProgressiveReflowPageRender()
 {
     m_Status = Ready;
     m_pReflowPage = NULL;
     m_pDisplayMatrix = NULL;
     m_CurrNum = 0;
     m_pFontEncoding = NULL;
     m_DisplayColor = -1;
 }
-static FX_FLOAT _CIDTransformToFloat(FX_BYTE ch)
+static FX_FLOAT _CIDTransformToFloat(uint8_t ch)
 {
     if (ch < 128) {
         return ch * 1.0f / 127;
     }
     return (-255 + ch) * 1.0f / 127;
 }
 int     CPDF_ProgressiveReflowPageRender::GetPosition()
 {
     if(m_CurrNum == 0 || NULL == m_pReflowPage) {
         return 0;
@@ skipping 173 matching lines @@
 {
     if (m_pDisplayMatrix) {
         delete m_pDisplayMatrix;
     }
     m_pDisplayMatrix = NULL;
     m_pReflowPage = NULL;
     m_pFXDevice = NULL;
     m_CurrNum = 0;
     m_Status = Ready;
 }