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

xfa/src/fxfa/src/app/xfa_ffimageedit.cpp

Index: xfa/src/fxfa/src/app/xfa_ffimageedit.cpp
diff --git a/xfa/src/fxfa/src/app/xfa_ffimageedit.cpp b/xfa/src/fxfa/src/app/xfa_ffimageedit.cpp
index 2075d90d21843f8b3d718e206730414085f90fda..0174ee71c59f2e6eb3a8f8a7f8e81905c4a5ee56 100644
--- a/xfa/src/fxfa/src/app/xfa_ffimageedit.cpp
+++ b/xfa/src/fxfa/src/app/xfa_ffimageedit.cpp
@@ -45,7 +45,7 @@ void CXFA_FFImageEdit::UnloadWidget()
     m_pDataAcc->SetImageEditImage(NULL);
     CXFA_FFField::UnloadWidget();
 }
-void CXFA_FFImageEdit::RenderWidget(CFX_Graphics* pGS, CFX_Matrix* pMatrix , FX_DWORD dwStatus , FX_INT32 iRotate )
+void CXFA_FFImageEdit::RenderWidget(CFX_Graphics* pGS, CFX_Matrix* pMatrix , FX_DWORD dwStatus , int32_t iRotate )
 {
     if (!IsMatchVisibleStatus(dwStatus)) {
         return;
@@ -62,20 +62,20 @@ void CXFA_FFImageEdit::RenderWidget(CFX_Graphics* pGS, CFX_Matrix* pMatrix , FX_
     if (CFX_DIBitmap* pDIBitmap = m_pDataAcc->GetImageEditImage()) {
         CFX_RectF rtImage;
         m_pNormalWidget->GetWidgetRect(rtImage);
-        FX_INT32 iHorzAlign = XFA_ATTRIBUTEENUM_Left;
-        FX_INT32 iVertAlign = XFA_ATTRIBUTEENUM_Top;
+        int32_t iHorzAlign = XFA_ATTRIBUTEENUM_Left;
+        int32_t iVertAlign = XFA_ATTRIBUTEENUM_Top;
         if (CXFA_Para para = m_pDataAcc->GetPara()) {
             iHorzAlign = para.GetHorizontalAlign();
             iVertAlign = para.GetVerticalAlign();
         }
-        FX_INT32 iAspect = XFA_ATTRIBUTEENUM_Fit;
+        int32_t iAspect = XFA_ATTRIBUTEENUM_Fit;
         if (CXFA_Value value = m_pDataAcc->GetFormValue()) {
             if (CXFA_Image imageObj = value.GetImage()) {
                 iAspect = imageObj.GetAspect();
             }
         }
-        FX_INT32 iImageXDpi = 0;
-        FX_INT32 iImageYDpi = 0;
+        int32_t iImageXDpi = 0;
+        int32_t iImageYDpi = 0;
         m_pDataAcc->GetImageEditDpi(iImageXDpi, iImageYDpi);
         XFA_DrawImage(pGS, rtImage, &mtRotate, pDIBitmap, iAspect, iImageXDpi, iImageYDpi, iHorzAlign, iVertAlign);
     }
@@ -106,7 +106,7 @@ FX_BOOL CXFA_FFImageEdit::OnLButtonDown(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT
     pAppProvider->LoadString(XFA_IDS_ImageFilter, wsFilter);
     CFX_WideStringArray wsPathArray;
     pAppProvider->ShowFileDialog(wsTitle, wsFilter, wsPathArray);
-    FX_INT32 iSize = wsPathArray.GetSize();
+    int32_t iSize = wsPathArray.GetSize();
     if (iSize < 1) {
         return TRUE;
     }
@@ -129,7 +129,7 @@ FX_BOOL CXFA_FFImageEdit::OnLButtonDown(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT
     CFX_WideString wsImage;
     IFX_FileRead* pFileRead = FX_CreateFileRead(wsFilePath);
     if (pFileRead != NULL) {
-        FX_INT32 nDataSize = pFileRead->GetSize();
+        int32_t nDataSize = pFileRead->GetSize();
         if (nDataSize > 0) {
             CFX_ByteString bsBuf;
             FX_LPSTR pImageBuffer = bsBuf.GetBuffer(nDataSize);
@@ -173,7 +173,7 @@ FX_BOOL CXFA_FFImageEdit::UpdateFWLData()
     m_pDataAcc->LoadImageEditImage();
     return TRUE;
 }
-FX_INT32 CXFA_FFImageEdit::OnProcessMessage(CFWL_Message *pMessage)
+int32_t CXFA_FFImageEdit::OnProcessMessage(CFWL_Message *pMessage)
 {
     return m_pOldDelegate->OnProcessMessage(pMessage);
 }