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

fpdfsdk/src/pdfwindow/PWL_Utils.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_Utils.h"
 #include "../../include/pdfwindow/PWL_Icon.h"
 
 #define IsFloatZero(f)                                          ((f) < 0.0001 && (f) > -0.0001)
 #define IsFloatBigger(fa,fb)                            ((fa) > (fb) && !IsFloatZero((fa) - (fb)))
 #define IsFloatSmaller(fa,fb)                           ((fa) < (fb) && !IsFloatZero((fa) - (fb)))
 #define IsFloatEqual(fa,fb)                                     IsFloatZero((fa)-(fb))
 
 /* ---------------------------- CPWL_Utils ------------------------------ */
 
-CFX_ByteString CPWL_Utils::GetAppStreamFromArray(const CPWL_PathData* pPathData, FX_INT32 nCount)
+CFX_ByteString CPWL_Utils::GetAppStreamFromArray(const CPWL_PathData* pPathData, int32_t nCount)
 {
         CFX_ByteTextBuf csAP;
 
-        for (FX_INT32 i=0; i<nCount; i++)
+        for (int32_t i=0; i<nCount; i++)
         {
                 switch (pPathData[i].type)
                 {
                 case PWLPT_MOVETO:
                         csAP << pPathData[i].point.x << " " << pPathData[i].point.y << " m\n";
                         break;
                 case PWLPT_LINETO:
                         csAP << pPathData[i].point.x << " " << pPathData[i].point.y << " l\n";
                         break;
                 case PWLPT_BEZIERTO:
                         csAP << pPathData[i].point.x << " " << pPathData[i].point.y << " "
                                  << pPathData[i+1].point.x << " " << pPathData[i+1].point.y << " "
                                  << pPathData[i+2].point.x << " " << pPathData[i+2].point.y << " c\n";
 
                         i += 2;
                         break;
                 default:
                         break;
                 }
         }
 
         return csAP.GetByteString();
 }
 
-void CPWL_Utils::GetPathDataFromArray(CFX_PathData& path, const CPWL_PathData* pPathData, FX_INT32 nCount)
+void CPWL_Utils::GetPathDataFromArray(CFX_PathData& path, const CPWL_PathData* pPathData, int32_t nCount)
 {
         path.SetPointCount(nCount);
 
-        for (FX_INT32 i=0; i<nCount; i++)
+        for (int32_t i=0; i<nCount; i++)
         {
                 switch (pPathData[i].type)
                 {
                 case PWLPT_MOVETO:
                         path.SetPoint(i, pPathData[i].point.x, pPathData[i].point.y, FXPT_MOVETO);
                         break;
                 case PWLPT_LINETO:
                         path.SetPoint(i, pPathData[i].point.x, pPathData[i].point.y, FXPT_LINETO);
                         break;
                 case PWLPT_BEZIERTO:
@@ skipping 73 matching lines @@
         return wrRet;
 }
 
 CFX_ByteString CPWL_Utils::GetAP_Check(const CPDF_Rect & crBBox)
 {
         CFX_ByteTextBuf csAP;
 
         FX_FLOAT fWidth = crBBox.right - crBBox.left;
         FX_FLOAT fHeight = crBBox.top - crBBox.bottom;
 
-        const FX_INT32 num = 8;
+        const int32_t num = 8;
 
         CPWL_Point pts[num*3] = 
         {
                 //1
                 CPWL_Point(0.28f, 0.52f), 
                 CPWL_Point(0.27f, 0.48f),
                 CPWL_Point(0.29f, 0.40f),
 
                 //2
                 CPWL_Point(0.30f, 0.33f), 
@@ skipping 24 matching lines @@
                 CPWL_Point(0.43f, 0.47f), 
                 CPWL_Point(0.40f, 0.47f),
                 CPWL_Point(0.41f, 0.58f),
 
                 //8
                 CPWL_Point(0.40f, 0.60f), 
                 CPWL_Point(0.28f, 0.66f),
                 CPWL_Point(0.30f, 0.56f)
         };
 
-        for (FX_INT32 j=0; j<num*3; j++)
+        for (int32_t j=0; j<num*3; j++)
         {
                 pts[j].x *= fWidth;
                 pts[j].x += crBBox.left;
 
                 pts[j].y *= fHeight;
                 pts[j].y += crBBox.bottom;
         }
 
         csAP << pts[0].x << " " << pts[0].y << " m\n";
 
-        for (FX_INT32 i=0; i<num; i++)
+        for (int32_t i=0; i<num; i++)
         {
-                FX_INT32 nCur = i*3;
-                FX_INT32 n1 = i*3 + 1;
-                FX_INT32 n2 = i*3 + 2;
-                FX_INT32 nNext = (i < num-1 ? (i+1)*3 : 0);
+                int32_t nCur = i*3;
+                int32_t n1 = i*3 + 1;
+                int32_t n2 = i*3 + 2;
+                int32_t nNext = (i < num-1 ? (i+1)*3 : 0);
 
                 FX_FLOAT px1 = pts[n1].x - pts[nCur].x;
                 FX_FLOAT py1 = pts[n1].y - pts[nCur].y;
                 FX_FLOAT px2 = pts[n2].x - pts[nNext].x;
                 FX_FLOAT py2 = pts[n2].y - pts[nNext].y;
 
                 csAP << pts[nCur].x + px1 * PWL_BEZIER << " " << pts[nCur].y + py1 * PWL_BEZIER << " " 
                         << pts[nNext].x + px2 * PWL_BEZIER << " " << pts[nNext].y + py2 * PWL_BEZIER << " "
                         << pts[nNext].x << " " << pts[nNext].y << " c\n";
         }
@@ skipping 96 matching lines @@
 {
         CFX_ByteTextBuf csAP;
 
         FX_FLOAT fRadius = (crBBox.top - crBBox.bottom)/(1+(FX_FLOAT)cos(PWL_PI/5.0f));
         CPDF_Point ptCenter = CPDF_Point((crBBox.left + crBBox.right) / 2.0f,(crBBox.top + crBBox.bottom) / 2.0f);
         
         FX_FLOAT px[5],py[5];
 
         FX_FLOAT fAngel = PWL_PI/10.0f;
 
-        for (FX_INT32 i=0; i<5; i++)
+        for (int32_t i=0; i<5; i++)
         {
                 px[i] = ptCenter.x + fRadius * (FX_FLOAT)cos(fAngel);
                 py[i] = ptCenter.y + fRadius * (FX_FLOAT)sin(fAngel);
 
                 fAngel += PWL_PI * 2 / 5.0f;
         }
 
         csAP << px[0] << " " << py[0] << " m\n";
 
-        FX_INT32 nNext = 0;
-        for (FX_INT32 j=0; j<5; j++)
+        int32_t nNext = 0;
+        for (int32_t j=0; j<5; j++)
         {
                 nNext += 2;
                 if (nNext >= 5) nNext -= 5;
                 csAP << px[nNext] << " " << py[nNext] << " l\n";
         }
 
         return csAP.GetByteString();
 }
 
 CFX_ByteString CPWL_Utils::GetAP_HalfCircle(const CPDF_Rect & crBBox,FX_FLOAT fRotate)
@@ skipping 123 matching lines @@
         return IFX_Edit::GetSelectAppearanceStream(pEdit,ptOffset,pRange);
 }
 
 static CFX_ByteString GetSquigglyAppearanceStream(FX_FLOAT fStartX, FX_FLOAT fEndX, FX_FLOAT fY, FX_FLOAT fStep)
 {
         CFX_ByteTextBuf sRet;
 
         sRet << "0 w\n" << fStartX << " " << fY << " m\n";
 
         FX_FLOAT fx;
-        FX_INT32 i;
+        int32_t i;
 
         for (i=1,fx=fStartX+fStep; fx<fEndX; fx+=fStep,i++)
         {
                 sRet << fx << " " << fY + (i&1)*fStep << " l\n";
         }
 
         sRet << "S\n";
 
         return sRet.GetByteString();
 }
@@ skipping 138 matching lines @@
                                 bLatinWord = FALSE;
                                 sWord.Empty();
                         }
                 }
         }
 
         return sRet.GetByteString();
 }
 
 CFX_ByteString CPWL_Utils::GetTextAppStream(const CPDF_Rect & rcBBox,IFX_Edit_FontMap * pFontMap,
-                                                                                                                const CFX_WideString & sText, FX_INT32 nAlignmentH, FX_INT32 nAlignmentV,
+                                                                                                                const CFX_WideString & sText, int32_t nAlignmentH, int32_t nAlignmentV,
                                                                                                                 FX_FLOAT fFontSize, FX_BOOL bMultiLine, FX_BOOL bAutoReturn, const CPWL_Color & crText)
 {
         CFX_ByteTextBuf sRet;
 
         if (IFX_Edit * pEdit = IFX_Edit::NewEdit())
         {
                 pEdit->SetFontMap(pFontMap);
                 pEdit->SetPlateRect(rcBBox);
                 pEdit->SetAlignmentH(nAlignmentH);
                 pEdit->SetAlignmentV(nAlignmentV);
@@ skipping 18 matching lines @@
         return sRet.GetByteString();
 }
 
 CFX_ByteString CPWL_Utils::GetPushButtonAppStream(const CPDF_Rect & rcBBox,
                                                                                         IFX_Edit_FontMap * pFontMap,
                                                                                         CPDF_Stream * pIconStream,
                                                                                         CPDF_IconFit & IconFit,
                                                                                         const CFX_WideString & sLabel,                                                                                  
                                                                                         const CPWL_Color & crText,
                                                                                         FX_FLOAT fFontSize,
-                                                                                        FX_INT32 nLayOut)
+                                                                                        int32_t nLayOut)
 {
         const FX_FLOAT fAutoFontScale = 1.0f / 3.0f;    
 
         if (IFX_Edit * pEdit = IFX_Edit::NewEdit())
         {
                 pEdit->SetFontMap(pFontMap);
                 pEdit->SetAlignmentH(1);
                 pEdit->SetAlignmentV(1);
                 pEdit->SetMultiLine(FALSE);
                 pEdit->SetAutoReturn(FALSE);
@@ skipping 252 matching lines @@
                 sColorStream << color.fColor1 << " " << color.fColor2 << " " << color.fColor3 << " " << color.fColor4 << " " 
                         << (bFillOrStroke ? "k" : "K") << "\n";
                 break;
         }
 
         return sColorStream.GetByteString();
 }
 
 CFX_ByteString CPWL_Utils::GetBorderAppStream(const CPDF_Rect & rect, FX_FLOAT fWidth,
                                                                                                 const CPWL_Color & color, const CPWL_Color & crLeftTop, const CPWL_Color & crRightBottom,
-                                                                                                FX_INT32 nStyle, const CPWL_Dash & dash)
+                                                                                                int32_t nStyle, const CPWL_Dash & dash)
 {
         CFX_ByteTextBuf sAppStream;
         CFX_ByteString sColor;
 
         FX_FLOAT fLeft = rect.left;
         FX_FLOAT fRight = rect.right;
         FX_FLOAT fTop = rect.top;
         FX_FLOAT fBottom = rect.bottom;
 
         if (fWidth > 0.0f)
@@ skipping 77 matching lines @@
                 }
                 
                 sAppStream << "Q\n";
         }
 
         return sAppStream.GetByteString();
 }
 
 CFX_ByteString CPWL_Utils::GetCircleBorderAppStream(const CPDF_Rect & rect, FX_FLOAT fWidth,
                                                                                                 const CPWL_Color & color, const CPWL_Color & crLeftTop, const CPWL_Color & crRightBottom,
-                                                                                                FX_INT32 nStyle, const CPWL_Dash & dash)
+                                                                                                int32_t nStyle, const CPWL_Dash & dash)
 {
         CFX_ByteTextBuf sAppStream;
         CFX_ByteString sColor;
 
         
 
 
 
 
         if (fWidth > 0.0f)
@@ skipping 182 matching lines @@
 }
 
 CFX_ByteString CPWL_Utils::GetAppStream_Star(const CPDF_Rect & rcBBox, const CPWL_Color & crText)
 {
         CFX_ByteTextBuf sAP;
         sAP << "q\n" << CPWL_Utils::GetColorAppStream(crText,TRUE) << CPWL_Utils::GetAP_Star(rcBBox) << "f\nQ\n";
         return sAP.GetByteString();
 }
 
 CFX_ByteString CPWL_Utils::GetCheckBoxAppStream(const CPDF_Rect & rcBBox,
-                                                                                                        FX_INT32 nStyle,
+                                                                                                        int32_t nStyle,
                                                                                                         const CPWL_Color & crText)
 {
         CPDF_Rect rcCenter = GetCenterSquare(rcBBox);
         switch (nStyle)
         {
         default:
         case PCS_CHECK:
                 return GetAppStream_Check(rcCenter,crText);
         case PCS_CIRCLE:
                 return GetAppStream_Circle(ScaleRect(rcCenter,2.0f/3.0f),crText);
         case PCS_CROSS:
                 return GetAppStream_Cross(rcCenter,crText);
         case PCS_DIAMOND:
                 return GetAppStream_Diamond(ScaleRect(rcCenter,2.0f/3.0f),crText);              
         case PCS_SQUARE:
                 return GetAppStream_Square(ScaleRect(rcCenter,2.0f/3.0f),crText);
         case PCS_STAR:
                 return GetAppStream_Star(ScaleRect(rcCenter,2.0f/3.0f),crText);
         }
 }
 
 CFX_ByteString CPWL_Utils::GetRadioButtonAppStream(const CPDF_Rect & rcBBox,
-                                                                                                        FX_INT32 nStyle,
+                                                                                                        int32_t nStyle,
                                                                                                         const CPWL_Color & crText)
 {
         CPDF_Rect rcCenter = GetCenterSquare(rcBBox);
         switch (nStyle)
         {
         default:
         case PCS_CHECK:
                 return GetAppStream_Check(rcCenter,crText);
         case PCS_CIRCLE:
                 return GetAppStream_Circle(ScaleRect(rcCenter,1.0f/2.0f),crText);
@@ skipping 84 matching lines @@
 {
         if (dR<0 || dR>1 || dG<0 || dG>1 || dB<0 || dB>1)
                 return;
 
         dC = 1.0f - dR;
         dM = 1.0f - dG;
         dY = 1.0f - dB;
         dK = FX_MIN(dC, FX_MIN(dM, dY));
 }
 
-void CPWL_Utils::PWLColorToARGB(const CPWL_Color& color, FX_INT32& alpha, FX_FLOAT& red, FX_FLOAT& green, FX_FLOAT& blue)
+void CPWL_Utils::PWLColorToARGB(const CPWL_Color& color, int32_t& alpha, FX_FLOAT& red, FX_FLOAT& green, FX_FLOAT& blue)
 {
         switch (color.nColorType)
         {
         case COLORTYPE_TRANSPARENT:
                 {
                         alpha = 0;
                 }
                 break;
         case COLORTYPE_GRAY:
                 {
                         ConvertGRAY2RGB(color.fColor1, red, green, blue);
                 }
                 break;
         case COLORTYPE_RGB:
                 {
                         red = color.fColor1;
                         green = color.fColor2;
                         blue = color.fColor3;
                 }
                 break;
         case COLORTYPE_CMYK:
                 {
                         ConvertCMYK2RGB(color.fColor1, color.fColor2, color.fColor3, color.fColor4,
                                 red, green, blue);
                 }
                 break;
         }
 }
 
-FX_COLORREF CPWL_Utils::PWLColorToFXColor(const CPWL_Color& color, FX_INT32 nTransparancy)
+FX_COLORREF CPWL_Utils::PWLColorToFXColor(const CPWL_Color& color, int32_t nTransparancy)
 {
-        FX_INT32 nAlpha = nTransparancy;
+        int32_t nAlpha = nTransparancy;
         FX_FLOAT dRed = 0;
         FX_FLOAT dGreen = 0;
         FX_FLOAT dBlue = 0;
 
         PWLColorToARGB(color, nAlpha, dRed, dGreen, dBlue);
 
-        return ArgbEncode(nAlpha, (FX_INT32)(dRed*255), (FX_INT32)(dGreen*255), (FX_INT32)(dBlue*255));
+        return ArgbEncode(nAlpha, (int32_t)(dRed*255), (int32_t)(dGreen*255), (int32_t)(dBlue*255));
 }
 
 void CPWL_Utils::DrawFillRect(CFX_RenderDevice* pDevice, CPDF_Matrix* pUser2Device,const CPDF_Rect & rect,
                                                           const FX_COLORREF & color)
 {
         CFX_PathData path;
         CPDF_Rect rcTemp(rect); 
         path.AppendRect(rcTemp.left,rcTemp.bottom,rcTemp.right,rcTemp.top);
         pDevice->DrawPath(&path, pUser2Device, NULL, color, 0, FXFILL_WINDING);
 }
 
 void CPWL_Utils::DrawFillArea(CFX_RenderDevice* pDevice, CPDF_Matrix* pUser2Device,
-                                                        const CPDF_Point* pPts, FX_INT32 nCount, const FX_COLORREF& color)
+                                                        const CPDF_Point* pPts, int32_t nCount, const FX_COLORREF& color)
 {
         CFX_PathData path;
         path.SetPointCount(nCount);
 
         path.SetPoint(0, pPts[0].x, pPts[0].y, FXPT_MOVETO);
-        for (FX_INT32 i=1; i<nCount; i++)
+        for (int32_t i=1; i<nCount; i++)
                 path.SetPoint(i, pPts[i].x, pPts[i].y, FXPT_LINETO);
 
         pDevice->DrawPath(&path, pUser2Device, NULL, color, 0, FXFILL_ALTERNATE);
 }
 
 void CPWL_Utils::DrawStrokeRect(CFX_RenderDevice* pDevice, CPDF_Matrix* pUser2Device,const CPDF_Rect & rect,
                                                           const FX_COLORREF & color, FX_FLOAT fWidth)
 {
         CFX_PathData path;
         CPDF_Rect rcTemp(rect); 
@@ skipping 13 matching lines @@
         path.SetPoint(0, ptMoveTo.x, ptMoveTo.y, FXPT_MOVETO);
         path.SetPoint(1, ptLineTo.x, ptLineTo.y, FXPT_LINETO);
 
         CFX_GraphStateData gsd;
         gsd.m_LineWidth = fWidth;
 
         pDevice->DrawPath(&path, pUser2Device, &gsd, 0, color, FXFILL_ALTERNATE);
 }
 
 void CPWL_Utils::DrawFillRect(CFX_RenderDevice* pDevice, CPDF_Matrix* pUser2Device,const CPDF_Rect & rect,
-                                                          const CPWL_Color & color, FX_INT32 nTransparancy)
+                                                          const CPWL_Color & color, int32_t nTransparancy)
 {
         CPWL_Utils::DrawFillRect(pDevice,pUser2Device,rect,PWLColorToFXColor(color,nTransparancy));
 }
 
 void CPWL_Utils::DrawShadow(CFX_RenderDevice* pDevice, CPDF_Matrix* pUser2Device,
                                                                                                                 FX_BOOL bVertical, FX_BOOL bHorizontal, CPDF_Rect rect,
-                                                                                                                FX_INT32 nTransparancy, FX_INT32 nStartGray, FX_INT32 nEndGray)
+                                                                                                                int32_t nTransparancy, int32_t nStartGray, int32_t nEndGray)
 {
         FX_FLOAT fStepGray = 1.0f;
 
         if (bVertical)
         {
                 fStepGray = (nEndGray - nStartGray) / rect.Height();
 
                 for (FX_FLOAT fy=rect.bottom+0.5f; fy<=rect.top-0.5f; fy+=1.0f)
                 {                       
-                        FX_INT32 nGray = nStartGray + (FX_INT32)(fStepGray * (fy-rect.bottom));
+                        int32_t nGray = nStartGray + (int32_t)(fStepGray * (fy-rect.bottom));
                         CPWL_Utils::DrawStrokeLine(pDevice, pUser2Device, CPDF_Point(rect.left, fy),
                                 CPDF_Point(rect.right, fy), ArgbEncode(nTransparancy, nGray, nGray, nGray), 1.5f);
                 }
         }
 
         if (bHorizontal)
         {
                 fStepGray = (nEndGray - nStartGray) / rect.Width();
 
                 for (FX_FLOAT fx=rect.left+0.5f; fx<=rect.right-0.5f; fx+=1.0f)
                 {                       
-                        FX_INT32 nGray = nStartGray + (FX_INT32)(fStepGray * (fx-rect.left));
+                        int32_t nGray = nStartGray + (int32_t)(fStepGray * (fx-rect.left));
                         CPWL_Utils::DrawStrokeLine(pDevice, pUser2Device, CPDF_Point(fx, rect.bottom),
                                 CPDF_Point(fx, rect.top), ArgbEncode(nTransparancy, nGray, nGray, nGray), 1.5f);
                 }
         }
 }
 
 void CPWL_Utils::DrawBorder(CFX_RenderDevice* pDevice, CPDF_Matrix* pUser2Device,
                                                                                                 const CPDF_Rect & rect, FX_FLOAT fWidth,
                                                                                                 const CPWL_Color & color, const CPWL_Color & crLeftTop, const CPWL_Color & crRightBottom,
-                                                                                                FX_INT32 nStyle, const CPWL_Dash & dash, FX_INT32 nTransparancy)
+                                                                                                int32_t nStyle, const CPWL_Dash & dash, int32_t nTransparancy)
 {
         FX_FLOAT fLeft = rect.left;
         FX_FLOAT fRight = rect.right;
         FX_FLOAT fTop = rect.top;
         FX_FLOAT fBottom = rect.bottom;
 
         if (fWidth > 0.0f)
         {
                 FX_FLOAT fHalfWidth = fWidth / 2.0f;
 
@@ skipping 94 matching lines @@
                 }
         }
 }
 
 static void AddSquigglyPath(CFX_PathData & PathData, FX_FLOAT fStartX, FX_FLOAT fEndX, FX_FLOAT fY, FX_FLOAT fStep)
 {
         PathData.AddPointCount(1);
         PathData.SetPoint(PathData.GetPointCount() - 1, fStartX, fY, FXPT_MOVETO);
 
         FX_FLOAT fx;
-        FX_INT32 i;
+        int32_t i;
 
         for (i=1,fx=fStartX+fStep; fx<fEndX; fx+=fStep,i++)
         {
                 PathData.AddPointCount(1);
                 PathData.SetPoint(PathData.GetPointCount() - 1, fx, fY + (i&1)*fStep, FXPT_LINETO);
         }
 }
 
 static void AddSpellCheckObj(CFX_PathData & PathData, IFX_Edit* pEdit, const CPVT_WordRange& wrWord)
 {
@@ skipping 70 matching lines @@
 
         CFX_PathData pathSpell;
 
         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 111 matching lines @@
                 crRet.fColor1 = 1.0f - crRet.fColor1;
                 crRet.fColor2 = 1.0f - crRet.fColor2;
                 crRet.fColor3 = 1.0f - crRet.fColor3;
                 crRet.fColor4 = 1.0f - crRet.fColor4;
                 break;
         }
 
         return crRet;
 }
 
-CFX_ByteString CPWL_Utils::GetIconAppStream(FX_INT32 nType, const CPDF_Rect& rect, const CPWL_Color& crFill, 
+CFX_ByteString CPWL_Utils::GetIconAppStream(int32_t nType, const CPDF_Rect& rect, const CPWL_Color& crFill, 
                                                                                                 const CPWL_Color& crStroke)
 {
         CFX_ByteString sAppStream = CPWL_Utils::GetColorAppStream(crStroke, FALSE);
         sAppStream += CPWL_Utils::GetColorAppStream(crFill, TRUE);
 
         CFX_ByteString sPath;
         CFX_PathData path;
 
         switch (nType)
         {
@@ skipping 62 matching lines @@
         sAppStream += sPath;
         if (crStroke.nColorType != COLORTYPE_TRANSPARENT)
                 sAppStream += "B*\n";
         else
                 sAppStream += "f*\n";
 
         return sAppStream;
 }
 
 void CPWL_Utils::DrawIconAppStream(CFX_RenderDevice* pDevice, CPDF_Matrix* pUser2Device,
-                                                FX_INT32 nType, const CPDF_Rect & rect, const CPWL_Color& crFill, const CPWL_Color& crStroke, const FX_INT32 nTransparancy)
+                                                int32_t nType, const CPDF_Rect & rect, const CPWL_Color& crFill, const CPWL_Color& crStroke, const int32_t nTransparancy)
 {
         CFX_GraphStateData gsd;
         gsd.m_LineWidth = 1.0f;
 
         CFX_ByteString sPath;
         CFX_PathData path;
 
         switch (nType)
         {
         case PWL_ICONTYPE_CHECKMARK:
@@ skipping 525 matching lines @@
         FX_FLOAT fLongRadius = (crBBox.top - crBBox.bottom)/(1+(FX_FLOAT)cos(PWL_PI/5.0f));
         fLongRadius = fLongRadius * 0.7f;
         FX_FLOAT fShortRadius = fLongRadius * 0.55f;
         CPDF_Point ptCenter = CPDF_Point((crBBox.left + crBBox.right) / 2.0f,(crBBox.top + crBBox.bottom) / 2.0f);
         
         FX_FLOAT px1[5], py1[5];
         FX_FLOAT px2[5], py2[5];
 
         FX_FLOAT fAngel = PWL_PI/10.0f;
 
-        for (FX_INT32 i=0; i<5; i++)
+        for (int32_t i=0; i<5; i++)
         {
                 px1[i] = ptCenter.x + fLongRadius * (FX_FLOAT)cos(fAngel);
                 py1[i] = ptCenter.y + fLongRadius * (FX_FLOAT)sin(fAngel);
 
                 fAngel += PWL_PI * 2 / 5.0f;
         }
 
         fAngel = PWL_PI/5.0f + PWL_PI/10.0f;
 
-        for (FX_INT32 j=0; j<5; j++)
+        for (int32_t j=0; j<5; j++)
         {
                 px2[j] = ptCenter.x + fShortRadius * (FX_FLOAT)cos(fAngel);
                 py2[j] = ptCenter.y + fShortRadius * (FX_FLOAT)sin(fAngel);
 
                 fAngel += PWL_PI * 2 / 5.0f;
         }
 
         CPWL_PathData PathArray[11];
         PathArray[0] = CPWL_PathData(CPWL_Point(px1[0], py1[0]), PWLPT_MOVETO);
         PathArray[1] = CPWL_PathData(CPWL_Point(px2[0], py2[0]), PWLPT_LINETO);
 
-        for(FX_INT32 k = 0; k < 4; k++)
+        for(int32_t k = 0; k < 4; k++)
         {
                 PathArray[(k+1)*2] = CPWL_PathData(CPWL_Point(px1[k+1], py1[k+1]), PWLPT_LINETO);
                 PathArray[(k+1)*2 + 1] = CPWL_PathData(CPWL_Point(px2[k+1], py2[k+1]), PWLPT_LINETO);
         }
 
         PathArray[10] = CPWL_PathData(CPWL_Point(px1[0], py1[0]), PWLPT_LINETO);
 
         if(type == PWLPT_STREAM)
                 sPathData = GetAppStreamFromArray(PathArray, 11);
         else
@@ skipping 275 matching lines @@
                 CPWL_PathData(CPWL_Point(crBBox.left+fOutWidth*0.04f, crBBox.top-fOutHeight*0.04f), PWLPT_LINETO),
                 */
         };
 
         if(type == PWLPT_STREAM)
                 sPathData = GetAppStreamFromArray(PathArray, 23);
         else
                 GetPathDataFromArray(path, PathArray, 23);
 }
 
-void CPWL_Color::ConvertColorType(FX_INT32 nColorType)
+void CPWL_Color::ConvertColorType(int32_t nColorType)
 {
         switch (this->nColorType)
         {
         case COLORTYPE_TRANSPARENT:
                 break;
         case COLORTYPE_GRAY:
                 switch (nColorType)
                 {
                 case COLORTYPE_RGB:
                         CPWL_Utils::ConvertGRAY2RGB(this->fColor1, this->fColor1, this->fColor2, this->fColor3);
@@ skipping 23 matching lines @@
                 case COLORTYPE_RGB:
                         CPWL_Utils::ConvertCMYK2RGB(this->fColor1, this->fColor2, this->fColor3, this->fColor4, this->fColor1, this->fColor2, this->fColor3);
                         break;
                 }
                 break;
         }
         this->nColorType = nColorType;
 }