From bfa9a824a20f37c2dd7111012b46c929cf2ed8a0 Mon Sep 17 00:00:00 2001
From: Tom Sepez <tsepez@chromium.org>
Date: Tue, 9 Jun 2015 13:24:12 -0700
Subject: Merge to XFA: Use stdint.h types throughout PDFium.

Near-automatic merge, plus re-running scripts to update
additional usage.

R=thestig@chromium.org

Review URL: https://codereview.chromium.org/1172793002
---
 core/include/fxcrt/fx_coordinates.h | 38 ++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

(limited to 'core/include/fxcrt/fx_coordinates.h')

diff --git a/core/include/fxcrt/fx_coordinates.h b/core/include/fxcrt/fx_coordinates.h
index 076c0e6a2f..c98ece9e07 100644
--- a/core/include/fxcrt/fx_coordinates.h
+++ b/core/include/fxcrt/fx_coordinates.h
@@ -113,15 +113,15 @@ public:
     }
     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>
@@ -227,7 +227,7 @@ public:
         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
@@ -524,11 +524,11 @@ public:
     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 {
@@ -602,13 +602,13 @@ struct FX_RECT {
 };
 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 
 {
@@ -807,7 +807,7 @@ public:
 
     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);
     }
@@ -831,17 +831,17 @@ public:
 
     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
     {
-- 
cgit v1.2.3