xfa/src/fdp/src/fde/fde_gedevice.cpp - Issue 1577503002: Merge to XFA: Switch most min/max macros to std::min/max.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: xfa/src/fdp/src/fde/fde_gedevice.cpp

Issue 1577503002: Merge to XFA: Switch most min/max macros to std::min/max. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa

Patch Set: rebase Created 4 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: xfa/src/fdp/src/fde/fde_gedevice.cpp

diff --git a/xfa/src/fdp/src/fde/fde_gedevice.cpp b/xfa/src/fdp/src/fde/fde_gedevice.cpp

index 08f05e74bb2c689dbcce2542dda6d07d848b60bb..f4e46d0d81c2a68fa220dfc0802442e4c5f8cd1d 100644

--- a/xfa/src/fdp/src/fde/fde_gedevice.cpp

+++ b/xfa/src/fdp/src/fde/fde_gedevice.cpp

@@ -4,6 +4,8 @@

+#include <algorithm>

#include "xfa/src/foxitlib.h"

#include "fde_gedevice.h"

#include "fde_geobject.h"

@@ -541,7 +543,7 @@ FX_BOOL CFDE_FxgeDevice::FillLinearGradientPath(IFDE_Brush* pBrush,

FX_FLOAT fLength = fDiagonal.Length();

FX_FLOAT fTotalX = fLength / FXSYS_cos(fTheta);

FX_FLOAT fTotalY = fLength / FXSYS_cos(FX_PI / 2 - fTheta);

- FX_FLOAT fSteps = FX_MAX(fTotalX, fTotalY);

+ FX_FLOAT fSteps = std::max(fTotalX, fTotalY);

FX_FLOAT dx = fTotalX / fSteps;

FX_FLOAT dy = fTotalY / fSteps;

FX_ARGB cr0, cr1;

« no previous file with comments | « xfa/src/fdp/src/css/fde_csscache.cpp ('k') | xfa/src/fdp/src/tto/fde_textout.cpp » ('j') | no next file with comments »