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>
diff --git a/core/fpdfapi/page/cpdf_textstate.cpp b/core/fpdfapi/page/cpdf_textstate.cpp index 990c9cc..520cb73 100644 --- a/core/fpdfapi/page/cpdf_textstate.cpp +++ b/core/fpdfapi/page/cpdf_textstate.cpp
@@ -25,51 +25,51 @@ m_Ref.GetPrivateCopy()->SetFont(pFont); } -FX_FLOAT CPDF_TextState::GetFontSize() const { +float CPDF_TextState::GetFontSize() const { return m_Ref.GetObject()->m_FontSize; } -void CPDF_TextState::SetFontSize(FX_FLOAT size) { +void CPDF_TextState::SetFontSize(float size) { m_Ref.GetPrivateCopy()->m_FontSize = size; } -const FX_FLOAT* CPDF_TextState::GetMatrix() const { +const float* CPDF_TextState::GetMatrix() const { return m_Ref.GetObject()->m_Matrix; } -FX_FLOAT* CPDF_TextState::GetMutableMatrix() { +float* CPDF_TextState::GetMutableMatrix() { return m_Ref.GetPrivateCopy()->m_Matrix; } -FX_FLOAT CPDF_TextState::GetCharSpace() const { +float CPDF_TextState::GetCharSpace() const { return m_Ref.GetObject()->m_CharSpace; } -void CPDF_TextState::SetCharSpace(FX_FLOAT sp) { +void CPDF_TextState::SetCharSpace(float sp) { m_Ref.GetPrivateCopy()->m_CharSpace = sp; } -FX_FLOAT CPDF_TextState::GetWordSpace() const { +float CPDF_TextState::GetWordSpace() const { return m_Ref.GetObject()->m_WordSpace; } -void CPDF_TextState::SetWordSpace(FX_FLOAT sp) { +void CPDF_TextState::SetWordSpace(float sp) { m_Ref.GetPrivateCopy()->m_WordSpace = sp; } -FX_FLOAT CPDF_TextState::GetFontSizeV() const { +float CPDF_TextState::GetFontSizeV() const { return m_Ref.GetObject()->GetFontSizeV(); } -FX_FLOAT CPDF_TextState::GetFontSizeH() const { +float CPDF_TextState::GetFontSizeH() const { return m_Ref.GetObject()->GetFontSizeH(); } -FX_FLOAT CPDF_TextState::GetBaselineAngle() const { +float CPDF_TextState::GetBaselineAngle() const { return m_Ref.GetObject()->GetBaselineAngle(); } -FX_FLOAT CPDF_TextState::GetShearAngle() const { +float CPDF_TextState::GetShearAngle() const { return m_Ref.GetObject()->GetShearAngle(); } @@ -81,11 +81,11 @@ m_Ref.GetPrivateCopy()->m_TextMode = mode; } -const FX_FLOAT* CPDF_TextState::GetCTM() const { +const float* CPDF_TextState::GetCTM() const { return m_Ref.GetObject()->m_CTM; } -FX_FLOAT* CPDF_TextState::GetMutableCTM() { +float* CPDF_TextState::GetMutableCTM() { return m_Ref.GetPrivateCopy()->m_CTM; } @@ -138,19 +138,19 @@ m_pFont = pFont; } -FX_FLOAT CPDF_TextState::TextData::GetFontSizeV() const { +float CPDF_TextState::TextData::GetFontSizeV() const { return FXSYS_fabs(FXSYS_sqrt2(m_Matrix[1], m_Matrix[3]) * m_FontSize); } -FX_FLOAT CPDF_TextState::TextData::GetFontSizeH() const { +float CPDF_TextState::TextData::GetFontSizeH() const { return FXSYS_fabs(FXSYS_sqrt2(m_Matrix[0], m_Matrix[2]) * m_FontSize); } -FX_FLOAT CPDF_TextState::TextData::GetBaselineAngle() const { +float CPDF_TextState::TextData::GetBaselineAngle() const { return FXSYS_atan2(m_Matrix[2], m_Matrix[0]); } -FX_FLOAT CPDF_TextState::TextData::GetShearAngle() const { +float CPDF_TextState::TextData::GetShearAngle() const { return GetBaselineAngle() + FXSYS_atan2(m_Matrix[1], m_Matrix[3]); }