diff options
author | Dan Sinclair <dsinclair@chromium.org> | 2017-03-14 14:43:42 -0400 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2017-03-14 19:05:58 +0000 |
commit | 05df075154a832fcb476e1dfcfb865722d0ea898 (patch) | |
tree | b8b771b62adae74d5d5ee561db75d10de3a848bf /fpdfsdk/fxedit/fxet_edit.cpp | |
parent | 6b94f01d1c8ad386d497428c7397b1a99614aeba (diff) | |
download | pdfium-05df075154a832fcb476e1dfcfb865722d0ea898.tar.xz |
Replace FX_FLOAT with underlying float type.
Change-Id: I158b7d80b0ec28b742a9f2d5a96f3dde7fb3ab56
Reviewed-on: https://pdfium-review.googlesource.com/3031
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Nicolás Peña <npm@chromium.org>
Diffstat (limited to 'fpdfsdk/fxedit/fxet_edit.cpp')
-rw-r--r-- | fpdfsdk/fxedit/fxet_edit.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/fpdfsdk/fxedit/fxet_edit.cpp b/fpdfsdk/fxedit/fxet_edit.cpp index 1acc57795a..0a5c3d940f 100644 --- a/fpdfsdk/fxedit/fxet_edit.cpp +++ b/fpdfsdk/fxedit/fxet_edit.cpp @@ -43,7 +43,7 @@ CFX_ByteString GetWordRenderString(const CFX_ByteString& strWords) { CFX_ByteString GetFontSetString(IPVT_FontMap* pFontMap, int32_t nFontIndex, - FX_FLOAT fFontSize) { + float fFontSize) { if (!pFontMap) return CFX_ByteString(); @@ -59,7 +59,7 @@ CFX_ByteString GetFontSetString(IPVT_FontMap* pFontMap, void DrawTextString(CFX_RenderDevice* pDevice, const CFX_PointF& pt, CPDF_Font* pFont, - FX_FLOAT fFontSize, + float fFontSize, CFX_Matrix* pUser2Device, const CFX_ByteString& str, FX_ARGB crTextFill, @@ -673,7 +673,7 @@ CFX_ByteString CFX_Edit::GetEditAppearanceStream(CFX_Edit* pEdit, sAppStream << nHorzScale << " Tz\n"; } - FX_FLOAT fCharSpace = pEdit->GetCharSpace(); + float fCharSpace = pEdit->GetCharSpace(); if (!IsFloatZero(fCharSpace)) { sAppStream << fCharSpace << " Tc\n"; } @@ -726,7 +726,7 @@ void CFX_Edit::DrawEdit(CFX_RenderDevice* pDevice, const bool bContinuous = pEdit->GetCharArray() == 0 && pEdit->GetCharSpace() <= 0.0f; uint16_t SubWord = pEdit->GetPasswordChar(); - FX_FLOAT fFontSize = pEdit->GetFontSize(); + float fFontSize = pEdit->GetFontSize(); CPVT_WordRange wrSelect = pEdit->GetSelectWordRange(); int32_t nHorzScale = pEdit->GetHorzScale(); @@ -921,7 +921,7 @@ void CFX_Edit::SetCharArray(int32_t nCharArray) { Paint(); } -void CFX_Edit::SetCharSpace(FX_FLOAT fCharSpace) { +void CFX_Edit::SetCharSpace(float fCharSpace) { m_pVT->SetCharSpace(fCharSpace); Paint(); } @@ -944,7 +944,7 @@ void CFX_Edit::SetAutoFontSize(bool bAuto, bool bPaint) { Paint(); } -void CFX_Edit::SetFontSize(FX_FLOAT fFontSize) { +void CFX_Edit::SetFontSize(float fFontSize) { m_pVT->SetFontSize(fFontSize); Paint(); } @@ -1139,7 +1139,7 @@ bool CFX_Edit::InsertText(const CFX_WideString& sText, int32_t charset) { return InsertText(sText, charset, true, true); } -FX_FLOAT CFX_Edit::GetFontSize() const { +float CFX_Edit::GetFontSize() const { return m_pVT->GetFontSize(); } @@ -1159,7 +1159,7 @@ int32_t CFX_Edit::GetHorzScale() const { return m_pVT->GetHorzScale(); } -FX_FLOAT CFX_Edit::GetCharSpace() const { +float CFX_Edit::GetCharSpace() const { return m_pVT->GetCharSpace(); } @@ -1269,7 +1269,7 @@ CFX_PointF CFX_Edit::VTToEdit(const CFX_PointF& point) const { CFX_FloatRect rcContent = m_pVT->GetContentRect(); CFX_FloatRect rcPlate = m_pVT->GetPlateRect(); - FX_FLOAT fPadding = 0.0f; + float fPadding = 0.0f; switch (m_nAlignment) { case 0: @@ -1291,7 +1291,7 @@ CFX_PointF CFX_Edit::EditToVT(const CFX_PointF& point) const { CFX_FloatRect rcContent = m_pVT->GetContentRect(); CFX_FloatRect rcPlate = m_pVT->GetPlateRect(); - FX_FLOAT fPadding = 0.0f; + float fPadding = 0.0f; switch (m_nAlignment) { case 0: @@ -1332,7 +1332,7 @@ void CFX_Edit::SetScrollInfo() { } } -void CFX_Edit::SetScrollPosX(FX_FLOAT fx) { +void CFX_Edit::SetScrollPosX(float fx) { if (!m_bEnableScroll) return; @@ -1344,7 +1344,7 @@ void CFX_Edit::SetScrollPosX(FX_FLOAT fx) { } } -void CFX_Edit::SetScrollPosY(FX_FLOAT fy) { +void CFX_Edit::SetScrollPosY(float fy) { if (!m_bEnableScroll) return; |