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

fpdfsdk/src/pdfwindow/PWL_Icon.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/pdfwindow/PDFWindow.h"
 #include "../../include/pdfwindow/PWL_Wnd.h"
 #include "../../include/pdfwindow/PWL_Icon.h"
 #include "../../include/pdfwindow/PWL_Utils.h"
@@ skipping 119 matching lines @@
 /* ------------------------------- CPWL_Icon ---------------------------------- */
 
 CPWL_Icon::CPWL_Icon() : m_pIconFit(NULL)
 {
 }
 
 CPWL_Icon::~CPWL_Icon()
 {
 }
 
-FX_INT32 CPWL_Icon::GetScaleMethod()
+int32_t CPWL_Icon::GetScaleMethod()
 {
         if (m_pIconFit)
                 return m_pIconFit->GetScaleMethod();
 
         return 0;
 }
 
 FX_BOOL CPWL_Icon::IsProportionalScale()
 {
         if (m_pIconFit)
@@ skipping 41 matching lines @@
         {
                 FX_FLOAT fImageWidth,fImageHeight;
                 FX_FLOAT fPlateWidth,fPlateHeight;
 
                 CPDF_Rect rcPlate = this->GetClientRect();      
                 fPlateWidth = rcPlate.right - rcPlate.left;
                 fPlateHeight = rcPlate.top - rcPlate.bottom;
 
                 GetImageSize(fImageWidth,fImageHeight);
 
-                FX_INT32 nScaleMethod = this->GetScaleMethod();
+                int32_t nScaleMethod = this->GetScaleMethod();
 
                 /*
                 enum ScaleMethod
                 {
                         Always = 0,     //A, Always scale
                         Bigger,         //B, Scale only when the icon is bigger than the annotation rectangle
                         Smaller,        //S, Scale only when the icon is smaller then the annotation rectangle
                         Never           //N, Never scale
                 };
                 */
@@ skipping 50 matching lines @@
 
         FX_FLOAT fPlateWidth,fPlateHeight;
         CPDF_Rect rcPlate = this->GetClientRect();      
         fPlateWidth = rcPlate.right - rcPlate.left;
         fPlateHeight = rcPlate.top - rcPlate.bottom;
 
         x = (fPlateWidth - fImageFactWidth) * fLeft;
         y = (fPlateHeight - fImageFactHeight)  * fBottom;
 }