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

core/include/fxcrt/fx_coordinates.h

 // 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
 
 #ifndef CORE_INCLUDE_FXCRT_FX_COORDINATES_H_
 #define CORE_INCLUDE_FXCRT_FX_COORDINATES_H_
 
 #include "fx_basic.h"
@@ skipping 95 matching lines @@
     }
     friend      FXT_PSV         operator / (const FXT_PSV &obj, baseType lamda)
     {
         CFX_PSVTemplate t;
         t.x = obj.x / lamda;
         t.y = obj.y / lamda;
         return t;
     }
     baseType x, y;
 };
-typedef CFX_PSVTemplate<FX_INT32>                       CFX_Point;
+typedef CFX_PSVTemplate<int32_t>                        CFX_Point;
 typedef CFX_PSVTemplate<FX_FLOAT>                       CFX_PointF;
-typedef CFX_PSVTemplate<FX_INT32>                       CFX_Size;
+typedef CFX_PSVTemplate<int32_t>                        CFX_Size;
 typedef CFX_PSVTemplate<FX_FLOAT>                       CFX_SizeF;
 typedef CFX_ArrayTemplate<CFX_Point>            CFX_Points;
 typedef CFX_ArrayTemplate<CFX_PointF>           CFX_PointsF;
-typedef CFX_PSVTemplate<FX_INT32> *                     FX_LPPOINT;
+typedef CFX_PSVTemplate<int32_t> *                      FX_LPPOINT;
 typedef CFX_PSVTemplate<FX_FLOAT> *                     FX_LPPOINTF;
-typedef CFX_PSVTemplate<FX_INT32> const *       FX_LPCPOINT;
+typedef CFX_PSVTemplate<int32_t> const *        FX_LPCPOINT;
 typedef CFX_PSVTemplate<FX_FLOAT> const *       FX_LPCPOINTF;
 #define CFX_FloatPoint  CFX_PointF
 template<class baseType>
 class CFX_VTemplate: public CFX_PSVTemplate<baseType>
 {
 public:
     typedef CFX_PSVTemplate<baseType>   FXT_PSV;
     typedef CFX_PSVTemplate<baseType>   FXT_POINT;
     typedef CFX_PSVTemplate<baseType>   FXT_SIZE;
     typedef CFX_VTemplate<baseType>             FXT_VECTOR;
@@ skipping 85 matching lines @@
         return (FX_FLOAT)FXSYS_acos(Cosine(v1, v2));
     }
     friend      FX_FLOAT        SlopeAngle(const FXT_VECTOR &v)
     {
         CFX_VTemplate vx;
         vx.Set(1, 0);
         FX_FLOAT fSlope = ArcCosine(v, vx);
         return v.y < 0 ? -fSlope : fSlope;
     }
 };
-typedef CFX_VTemplate<FX_INT32> CFX_Vector;
+typedef CFX_VTemplate<int32_t> CFX_Vector;
 typedef CFX_VTemplate<FX_FLOAT> CFX_VectorF;
 template<class baseType>
 class CFX_RTemplate
 {
 public:
     typedef CFX_PSVTemplate<baseType>   FXT_POINT;
     typedef CFX_PSVTemplate<baseType>   FXT_SIZE;
     typedef CFX_VTemplate<baseType>             FXT_VECTOR;
     typedef CFX_PRLTemplate<baseType>   FXT_PARAL;
     typedef CFX_RTemplate<baseType>             FXT_RECT;
@@ skipping 276 matching lines @@
     {
         return rc1.left == rc2.left && rc1.top == rc2.top && rc1.width == rc2.width && rc1.height == rc2.height;
     }
     friend      FX_BOOL operator != (const FXT_RECT &rc1, const FXT_RECT &rc2)
     {
         return rc1.left != rc2.left || rc1.top != rc2.top || rc1.width != rc2.width || rc1.height != rc2.height;
     }
     baseType left, top;
     baseType width, height;
 };
-typedef CFX_RTemplate<FX_INT32>                 CFX_Rect;
+typedef CFX_RTemplate<int32_t>                  CFX_Rect;
 typedef CFX_RTemplate<FX_FLOAT>                 CFX_RectF;
-typedef CFX_RTemplate<FX_INT32> *               FX_LPRECT;
+typedef CFX_RTemplate<int32_t> *                FX_LPRECT;
 typedef CFX_RTemplate<FX_FLOAT> *               FX_LPRECTF;
-typedef CFX_RTemplate<FX_INT32> const * FX_LPCRECT;
+typedef CFX_RTemplate<int32_t> const *  FX_LPCRECT;
 typedef CFX_RTemplate<FX_FLOAT> const * FX_LPCRECTF;
 typedef CFX_ArrayTemplate<CFX_RectF>    CFX_RectFArray;
 struct FX_RECT {
 
     int                 left;
 
     int                 top;
 
     int                 right;
 
@@ skipping 53 matching lines @@
         return other_rect.left >= left && other_rect.right <= right && other_rect.top >= top && other_rect.bottom <= bottom;
     }
 
     FX_BOOL             Contains(int x, int y) const
     {
         return x >= left && x < right && y >= top && y < bottom;
     }
 };
 struct FX_SMALL_RECT {
 
-    FX_SHORT    Left;
+    int16_t     Left;
 
-    FX_SHORT    Top;
+    int16_t     Top;
 
-    FX_SHORT    Right;
+    int16_t     Right;
 
-    FX_SHORT    Bottom;
+    int16_t     Bottom;
 };
 class CFX_FloatRect 
 {
 public:
 
     CFX_FloatRect()
     {
         left = right = bottom = top = 0;
     }
 
@@ skipping 178 matching lines @@
         return a == 1 && b == 0 && c == 0 && d == 1 && e == 0 && f == 0;
     }
     FX_BOOL                     IsInvertible() const;
 
     FX_BOOL                     Is90Rotated() const;
 
     FX_BOOL                     IsScaled() const;
 
     void                        Translate(FX_FLOAT x, FX_FLOAT y, FX_BOOL bPrepended = FALSE);
 
-    void                        TranslateI(FX_INT32 x, FX_INT32 y, FX_BOOL bPrepended = FALSE)
+    void                        TranslateI(int32_t x, int32_t y, FX_BOOL bPrepended = FALSE)
     {
         Translate((FX_FLOAT)x, (FX_FLOAT)y, bPrepended);
     }
 
     void                        Scale(FX_FLOAT sx, FX_FLOAT sy, FX_BOOL bPrepended = FALSE);
 
     void                        Rotate(FX_FLOAT fRadian, FX_BOOL bPrepended = FALSE);
 
     void                        RotateAt(FX_FLOAT fRadian, FX_FLOAT x, FX_FLOAT y, FX_BOOL bPrepended = FALSE);
 
     void                        Shear(FX_FLOAT fAlphaRadian, FX_FLOAT fBetaRadian, FX_BOOL bPrepended = FALSE);
 
     void                        MatchRect(const CFX_FloatRect &dest, const CFX_FloatRect &src);
 
     FX_FLOAT            GetXUnit() const;
 
     FX_FLOAT            GetYUnit() const;
     void                        GetUnitRect(CFX_RectF &rect) const;
 
     CFX_FloatRect       GetUnitRect() const;
 
     FX_FLOAT            GetUnitArea() const;
     FX_FLOAT            TransformXDistance(FX_FLOAT dx) const;
-    FX_INT32            TransformXDistance(FX_INT32 dx) const;
+    int32_t             TransformXDistance(int32_t dx) const;
     FX_FLOAT            TransformYDistance(FX_FLOAT dy) const;
-    FX_INT32            TransformYDistance(FX_INT32 dy) const;
+    int32_t             TransformYDistance(int32_t dy) const;
     FX_FLOAT            TransformDistance(FX_FLOAT dx, FX_FLOAT dy) const;
-    FX_INT32            TransformDistance(FX_INT32 dx, FX_INT32 dy) const;
+    int32_t             TransformDistance(int32_t dx, int32_t dy) const;
 
     FX_FLOAT            TransformDistance(FX_FLOAT distance) const;
     void                        TransformPoint(FX_FLOAT &x, FX_FLOAT &y) const;
-    void                        TransformPoint(FX_INT32 &x, FX_INT32 &y) const;
-    void                        TransformPoints(CFX_PointF *points, FX_INT32 iCount) const;
-    void                        TransformPoints(CFX_Point *points, FX_INT32 iCount) const;
+    void                        TransformPoint(int32_t &x, int32_t &y) const;
+    void                        TransformPoints(CFX_PointF *points, int32_t iCount) const;
+    void                        TransformPoints(CFX_Point *points, int32_t iCount) const;
 
     void                        Transform(FX_FLOAT& x, FX_FLOAT& y) const
     {
         TransformPoint(x, y);
     }
 
     void                        Transform(FX_FLOAT x, FX_FLOAT y, FX_FLOAT& x1, FX_FLOAT& y1) const
     {
         x1 = x, y1 = y;
         TransformPoint(x1, y1);
@@ skipping 43 matching lines @@
     FX_FLOAT a;
     FX_FLOAT b;
     FX_FLOAT c;
     FX_FLOAT d;
     FX_FLOAT e;
     FX_FLOAT f;
 };
 #define CFX_AffineMatrix        CFX_Matrix
 
 #endif  // CORE_INCLUDE_FXCRT_FX_COORDINATES_H_