diff options
author | Tom Sepez <tsepez@chromium.org> | 2015-07-27 14:49:43 -0700 |
---|---|---|
committer | Tom Sepez <tsepez@chromium.org> | 2015-07-27 14:49:43 -0700 |
commit | 93253e8d623cd3e0751ea45df1e414be1495335e (patch) | |
tree | db789182a2d8f0b1c5d384576b2129c2846dba32 /core/src/fxge/win32/fx_win32_gdipext.cpp | |
parent | 2c3d8060505f382477dde7e79618480d774f19c3 (diff) | |
download | pdfium-93253e8d623cd3e0751ea45df1e414be1495335e.tar.xz |
Merge to XFA: Fix FX_BOOL compilation errors under windows
(cherry picked from commit a25b4bca69ab26d174edb8cefbdcfc1a0353915a)
Original Review URL: https://codereview.chromium.org/1254973004 .
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1252943010 .
Diffstat (limited to 'core/src/fxge/win32/fx_win32_gdipext.cpp')
-rw-r--r-- | core/src/fxge/win32/fx_win32_gdipext.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/src/fxge/win32/fx_win32_gdipext.cpp b/core/src/fxge/win32/fx_win32_gdipext.cpp index fff9e88bbb..a1150d5660 100644 --- a/core/src/fxge/win32/fx_win32_gdipext.cpp +++ b/core/src/fxge/win32/fx_win32_gdipext.cpp @@ -824,7 +824,7 @@ static GpPen* _GdipCreatePen(const CFX_GraphStateData* pGraphState, const CFX_Af CallFunc(GdipSetPenMiterLimit)(pPen, pGraphState->m_MiterLimit); return pPen; } -static BOOL IsSmallTriangle(PointF* points, const CFX_AffineMatrix* pMatrix, int& v1, int& v2) +static FX_BOOL IsSmallTriangle(PointF* points, const CFX_AffineMatrix* pMatrix, int& v1, int& v2) { int pairs[] = {1, 2, 0, 2, 0, 1}; for (int i = 0; i < 3; i ++) { @@ -847,7 +847,7 @@ static BOOL IsSmallTriangle(PointF* points, const CFX_AffineMatrix* pMatrix, int } return FALSE; } -BOOL CGdiplusExt::DrawPath(HDC hDC, const CFX_PathData* pPathData, +FX_BOOL CGdiplusExt::DrawPath(HDC hDC, const CFX_PathData* pPathData, const CFX_AffineMatrix* pObject2Device, const CFX_GraphStateData* pGraphState, FX_DWORD fill_argb, |