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 | |
| 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')
| -rw-r--r-- | core/src/fxge/win32/fx_win32_device.cpp | 8 | ||||
| -rw-r--r-- | core/src/fxge/win32/fx_win32_gdipext.cpp | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/core/src/fxge/win32/fx_win32_device.cpp b/core/src/fxge/win32/fx_win32_device.cpp index 3a328c0e6a..d7522f8cb6 100644 --- a/core/src/fxge/win32/fx_win32_device.cpp +++ b/core/src/fxge/win32/fx_win32_device.cpp @@ -25,7 +25,7 @@ public: ~CWin32FontInfo(); virtual void Release(); virtual FX_BOOL EnumFontList(CFX_FontMapper* pMapper); - virtual void* MapFont(int weight, FX_BOOL bItalic, int charset, int pitch_family, const FX_CHAR* face, FX_BOOL& bExact); + virtual void* MapFont(int weight, FX_BOOL bItalic, int charset, int pitch_family, const FX_CHAR* face, int& iExact); virtual void* GetFont(const FX_CHAR* face) { return NULL; @@ -285,7 +285,7 @@ void CWin32FontInfo::GetJapanesePreference(CFX_ByteString& face, int weight, int face = "MS PMincho"; } } -void* CWin32FontInfo::MapFont(int weight, FX_BOOL bItalic, int charset, int pitch_family, const FX_CHAR* cstr_face, FX_BOOL& bExact) +void* CWin32FontInfo::MapFont(int weight, FX_BOOL bItalic, int charset, int pitch_family, const FX_CHAR* cstr_face, int& iExact) { CFX_ByteString face = cstr_face; int iBaseFont; @@ -294,7 +294,7 @@ void* CWin32FontInfo::MapFont(int weight, FX_BOOL bItalic, int charset, int pitc face = Base14Substs[iBaseFont].m_pWinName; weight = Base14Substs[iBaseFont].m_bBold ? FW_BOLD : FW_NORMAL; bItalic = Base14Substs[iBaseFont].m_bItalic; - bExact = TRUE; + iExact = TRUE; break; } if (charset == ANSI_CHARSET || charset == SYMBOL_CHARSET) { @@ -597,7 +597,7 @@ FX_BOOL CGdiDeviceDriver::GDI_StretchBitMask(const CFX_DIBitmap* pBitmap1, int d return TRUE; } -BOOL CGdiDeviceDriver::GetClipBox(FX_RECT* pRect) +FX_BOOL CGdiDeviceDriver::GetClipBox(FX_RECT* pRect) { return ::GetClipBox(m_hDC, (RECT*)pRect); } 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, |