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 /fpdfsdk | |
| 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 'fpdfsdk')
| -rw-r--r-- | fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp | 2 | ||||
| -rw-r--r-- | fpdfsdk/javascript/JS_Value.cpp | 11 | ||||
| -rw-r--r-- | fpdfsdk/pdfwindow/PWL_ScrollBar.cpp | 4 |
3 files changed, 8 insertions, 9 deletions
diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp b/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp index 7afd12c707..4c8591e2eb 100644 --- a/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp +++ b/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp @@ -289,7 +289,7 @@ void CPDFXFA_DocEnvironment::PageViewEvent(CXFA_FFPageView* pPageView, int flag = (nNewCount < m_pContext->GetOriginalPageCount()) ? FXFA_PAGEVIEWEVENT_POSTREMOVED : FXFA_PAGEVIEWEVENT_POSTADDED; - int count = FXSYS_abs(nNewCount - m_pContext->GetOriginalPageCount()); + int count = abs(nNewCount - m_pContext->GetOriginalPageCount()); m_pContext->SetOriginalPageCount(nNewCount); pFormFillEnv->PageEvent(count, flag); } diff --git a/fpdfsdk/javascript/JS_Value.cpp b/fpdfsdk/javascript/JS_Value.cpp index a0c286f68d..e9fa9a0fbe 100644 --- a/fpdfsdk/javascript/JS_Value.cpp +++ b/fpdfsdk/javascript/JS_Value.cpp @@ -501,7 +501,7 @@ int _isfinite(double v) { } double _toInteger(double n) { - return (n >= 0) ? FXSYS_floor(n) : -FXSYS_floor(-n); + return (n >= 0) ? floor(n) : -floor(-n); } bool _isLeapYear(int year) { @@ -509,9 +509,8 @@ bool _isLeapYear(int year) { } int _DayFromYear(int y) { - return (int)(365 * (y - 1970.0) + FXSYS_floor((y - 1969.0) / 4) - - FXSYS_floor((y - 1901.0) / 100) + - FXSYS_floor((y - 1601.0) / 400)); + return (int)(365 * (y - 1970.0) + floor((y - 1969.0) / 4) - + floor((y - 1901.0) / 100) + floor((y - 1601.0) / 400)); } double _TimeFromYear(int y) { @@ -529,7 +528,7 @@ double _TimeFromYearMonth(int y, int m) { } int _Day(double t) { - return (int)FXSYS_floor(t / 86400000); + return (int)floor(t / 86400000); } int _YearFromTime(double t) { @@ -699,7 +698,7 @@ double JS_MakeDay(int nYear, int nMonth, int nDate) { double y = _toInteger(nYear); double m = _toInteger(nMonth); double dt = _toInteger(nDate); - double ym = y + FXSYS_floor((double)m / 12); + double ym = y + floor((double)m / 12); double mn = _Mod(m, 12); double t = _TimeFromYearMonth((int)ym, (int)mn); diff --git a/fpdfsdk/pdfwindow/PWL_ScrollBar.cpp b/fpdfsdk/pdfwindow/PWL_ScrollBar.cpp index 9289f44aa0..1c3efb1faa 100644 --- a/fpdfsdk/pdfwindow/PWL_ScrollBar.cpp +++ b/fpdfsdk/pdfwindow/PWL_ScrollBar.cpp @@ -1003,12 +1003,12 @@ void CPWL_ScrollBar::OnPosButtonMouseMove(const CFX_PointF& point) { switch (m_sbType) { case SBT_HSCROLL: - if (FXSYS_fabs(point.x - m_nOldPos) < 1) + if (fabs(point.x - m_nOldPos) < 1) return; fNewPos = FaceToTrue(m_fOldPosButton + point.x - m_nOldPos); break; case SBT_VSCROLL: - if (FXSYS_fabs(point.y - m_nOldPos) < 1) + if (fabs(point.y - m_nOldPos) < 1) return; fNewPos = FaceToTrue(m_fOldPosButton + point.y - m_nOldPos); break; |