diff options
author | Dan Sinclair <dsinclair@chromium.org> | 2017-04-03 14:51:45 -0400 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2017-04-03 20:36:56 +0000 |
commit | 669a418f75c05d4a39e2bcaff2b7b93dec1c5764 (patch) | |
tree | b76f5025c8e70b1ef449f317ff60a8eef7317ab9 /core/fpdfapi/page | |
parent | ac978f83392e309488601eb382d5f318b6d366ad (diff) | |
download | pdfium-669a418f75c05d4a39e2bcaff2b7b93dec1c5764.tar.xz |
Drop FXSYS_ from math methods
This Cl drops the FXSYS_ from math methods which are the same on all
platforms.
Bug: pdfium:694
Change-Id: I85c9ff841fd9095b1434f67319847ba0cd9df7ac
Reviewed-on: https://pdfium-review.googlesource.com/3598
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'core/fpdfapi/page')
-rw-r--r-- | core/fpdfapi/page/cpdf_colorspace.cpp | 2 | ||||
-rw-r--r-- | core/fpdfapi/page/cpdf_textstate.cpp | 8 | ||||
-rw-r--r-- | core/fpdfapi/page/cpdf_tilingpattern.cpp | 4 | ||||
-rw-r--r-- | core/fpdfapi/page/fpdf_page_func.cpp | 18 |
4 files changed, 16 insertions, 16 deletions
diff --git a/core/fpdfapi/page/cpdf_colorspace.cpp b/core/fpdfapi/page/cpdf_colorspace.cpp index 3244319cc2..913c9c728d 100644 --- a/core/fpdfapi/page/cpdf_colorspace.cpp +++ b/core/fpdfapi/page/cpdf_colorspace.cpp @@ -265,7 +265,7 @@ class Matrix_3by3 { Matrix_3by3 Inverse() { float det = a * (e * i - f * h) - b * (i * d - f * g) + c * (d * h - e * g); - if (FXSYS_fabs(det) < std::numeric_limits<float>::epsilon()) + if (fabs(det) < std::numeric_limits<float>::epsilon()) return Matrix_3by3(); return Matrix_3by3( diff --git a/core/fpdfapi/page/cpdf_textstate.cpp b/core/fpdfapi/page/cpdf_textstate.cpp index 520cb7365b..ed90bd310d 100644 --- a/core/fpdfapi/page/cpdf_textstate.cpp +++ b/core/fpdfapi/page/cpdf_textstate.cpp @@ -139,19 +139,19 @@ void CPDF_TextState::TextData::SetFont(CPDF_Font* pFont) { } float CPDF_TextState::TextData::GetFontSizeV() const { - return FXSYS_fabs(FXSYS_sqrt2(m_Matrix[1], m_Matrix[3]) * m_FontSize); + return fabs(FXSYS_sqrt2(m_Matrix[1], m_Matrix[3]) * m_FontSize); } float CPDF_TextState::TextData::GetFontSizeH() const { - return FXSYS_fabs(FXSYS_sqrt2(m_Matrix[0], m_Matrix[2]) * m_FontSize); + return fabs(FXSYS_sqrt2(m_Matrix[0], m_Matrix[2]) * m_FontSize); } float CPDF_TextState::TextData::GetBaselineAngle() const { - return FXSYS_atan2(m_Matrix[2], m_Matrix[0]); + return atan2(m_Matrix[2], m_Matrix[0]); } float CPDF_TextState::TextData::GetShearAngle() const { - return GetBaselineAngle() + FXSYS_atan2(m_Matrix[1], m_Matrix[3]); + return GetBaselineAngle() + atan2(m_Matrix[1], m_Matrix[3]); } bool SetTextRenderingModeFromInt(int iMode, TextRenderingMode* mode) { diff --git a/core/fpdfapi/page/cpdf_tilingpattern.cpp b/core/fpdfapi/page/cpdf_tilingpattern.cpp index fb46dd2b3e..a68b4423e5 100644 --- a/core/fpdfapi/page/cpdf_tilingpattern.cpp +++ b/core/fpdfapi/page/cpdf_tilingpattern.cpp @@ -41,8 +41,8 @@ bool CPDF_TilingPattern::Load() { return false; m_bColored = pDict->GetIntegerFor("PaintType") == 1; - m_XStep = (float)FXSYS_fabs(pDict->GetNumberFor("XStep")); - m_YStep = (float)FXSYS_fabs(pDict->GetNumberFor("YStep")); + m_XStep = (float)fabs(pDict->GetNumberFor("XStep")); + m_YStep = (float)fabs(pDict->GetNumberFor("YStep")); CPDF_Stream* pStream = m_pPatternObj->AsStream(); if (!pStream) diff --git a/core/fpdfapi/page/fpdf_page_func.cpp b/core/fpdfapi/page/fpdf_page_func.cpp index 30f3b895d4..8ea4194eaa 100644 --- a/core/fpdfapi/page/fpdf_page_func.cpp +++ b/core/fpdfapi/page/fpdf_page_func.cpp @@ -289,15 +289,15 @@ bool CPDF_PSEngine::DoOperator(PDF_PSOP op) { break; case PSOP_ABS: d1 = Pop(); - Push((float)FXSYS_fabs(d1)); + Push((float)fabs(d1)); break; case PSOP_CEILING: d1 = Pop(); - Push((float)FXSYS_ceil(d1)); + Push((float)ceil(d1)); break; case PSOP_FLOOR: d1 = Pop(); - Push((float)FXSYS_floor(d1)); + Push((float)floor(d1)); break; case PSOP_ROUND: d1 = Pop(); @@ -309,20 +309,20 @@ bool CPDF_PSEngine::DoOperator(PDF_PSOP op) { break; case PSOP_SQRT: d1 = Pop(); - Push((float)FXSYS_sqrt(d1)); + Push((float)sqrt(d1)); break; case PSOP_SIN: d1 = Pop(); - Push((float)FXSYS_sin(d1 * FX_PI / 180.0f)); + Push((float)sin(d1 * FX_PI / 180.0f)); break; case PSOP_COS: d1 = Pop(); - Push((float)FXSYS_cos(d1 * FX_PI / 180.0f)); + Push((float)cos(d1 * FX_PI / 180.0f)); break; case PSOP_ATAN: d2 = Pop(); d1 = Pop(); - d1 = (float)(FXSYS_atan2(d1, d2) * 180.0 / FX_PI); + d1 = (float)(atan2(d1, d2) * 180.0 / FX_PI); if (d1 < 0) { d1 += 360; } @@ -335,11 +335,11 @@ bool CPDF_PSEngine::DoOperator(PDF_PSOP op) { break; case PSOP_LN: d1 = Pop(); - Push((float)FXSYS_log(d1)); + Push((float)log(d1)); break; case PSOP_LOG: d1 = Pop(); - Push((float)FXSYS_log10(d1)); + Push((float)log10(d1)); break; case PSOP_CVI: i1 = (int)Pop(); |