From 698aed79d6ad6e8e3a0c7a500c108d69f944b82d Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Tue, 26 Sep 2017 16:24:49 -0400 Subject: Cleanup FX macros This CL renames the FX_OS defines to have _OS_ in their names and drops the _DESKTOP suffix. The FXM defines have been changed to just FX. Change-Id: Iab172fba541713b5f6d14fb8098baf68e3364c74 Reviewed-on: https://pdfium-review.googlesource.com/14833 Reviewed-by: Tom Sepez Commit-Queue: dsinclair --- xfa/fde/cfde_textout.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'xfa/fde') diff --git a/xfa/fde/cfde_textout.cpp b/xfa/fde/cfde_textout.cpp index 0e9005d88e..c31b178ef6 100644 --- a/xfa/fde/cfde_textout.cpp +++ b/xfa/fde/cfde_textout.cpp @@ -52,7 +52,7 @@ bool CFDE_TextOut::DrawString(CFX_RenderDevice* device, } } -#if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_ +#if _FX_PLATFORM_ != _FX_PLATFORM_WINDOWS_ uint32_t dwFontStyle = pFont->GetFontStyles(); CFX_Font FxFont; auto SubstFxFont = pdfium::MakeUnique(); @@ -61,7 +61,7 @@ bool CFDE_TextOut::DrawString(CFX_RenderDevice* device, SubstFxFont->m_WeightCJK = SubstFxFont->m_Weight; SubstFxFont->m_bItalicCJK = !!(dwFontStyle & FX_FONTSTYLE_Italic); FxFont.SetSubstFont(std::move(SubstFxFont)); -#endif // _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_ +#endif // _FX_PLATFORM_ != _FX_PLATFORM_WINDOWS_ RetainPtr pCurFont; FXTEXT_CHARPOS* pCurCP = nullptr; @@ -76,12 +76,12 @@ bool CFDE_TextOut::DrawString(CFX_RenderDevice* device, pFxFont = pCurFont->GetDevFont(); CFX_Font* font; -#if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_ +#if _FX_PLATFORM_ != _FX_PLATFORM_WINDOWS_ FxFont.SetFace(pFxFont->GetFace()); font = &FxFont; #else font = pFxFont; -#endif // _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_ +#endif // _FX_PLATFORM_ != _FX_PLATFORM_WINDOWS_ device->DrawNormalText(iCurCount, pCurCP, font, -fFontSize, pMatrix, color, FXTEXT_CLEARTYPE); @@ -99,20 +99,20 @@ bool CFDE_TextOut::DrawString(CFX_RenderDevice* device, if (pCurFont && iCurCount) { pFxFont = pCurFont->GetDevFont(); CFX_Font* font; -#if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_ +#if _FX_PLATFORM_ != _FX_PLATFORM_WINDOWS_ FxFont.SetFace(pFxFont->GetFace()); font = &FxFont; #else font = pFxFont; -#endif // _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_ +#endif // _FX_PLATFORM_ != _FX_PLATFORM_WINDOWS_ bRet = device->DrawNormalText(iCurCount, pCurCP, font, -fFontSize, pMatrix, color, FXTEXT_CLEARTYPE); } -#if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_ +#if _FX_PLATFORM_ != _FX_PLATFORM_WINDOWS_ FxFont.SetFace(nullptr); -#endif // _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_ +#endif // _FX_PLATFORM_ != _FX_PLATFORM_WINDOWS_ return bRet; } -- cgit v1.2.3