xfa/src/fxfa/src/app/xfa_fontmgr.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/fxfa/src/app/xfa_fontmgr.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/fxfa/src/app/xfa_fontmgr.cpp

diff --git a/xfa/src/fxfa/src/app/xfa_fontmgr.cpp b/xfa/src/fxfa/src/app/xfa_fontmgr.cpp

index 5be4c8b426a773eca2f868ea90ea5cfa675e5d1b..ad5120e493185f7c596771327b98842a1adf392a 100644

--- a/xfa/src/fxfa/src/app/xfa_fontmgr.cpp

+++ b/xfa/src/fxfa/src/app/xfa_fontmgr.cpp

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

+#include <algorithm>

#include "xfa/src/foxitlib.h"

#include "xfa/src/fxfa/src/common/xfa_common.h"

#include "xfa_fontmgr.h"

@@ -1983,7 +1985,7 @@ FX_BOOL CXFA_PDFFontMgr::PsNameMatchDRFontName(

}

if (bBoldFont) {

iDifferLength =

- FX_MIN(iDifferLength - 4, bsDRName.GetLength() - iBoldIndex - 4);

+ std::min(iDifferLength - 4, bsDRName.GetLength() - iBoldIndex - 4);

}

FX_BOOL bItalicFont = TRUE;

if (bsDRName.Find("Italic") > 0) {

« no previous file with comments | « xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp ('k') | xfa/src/fxfa/src/app/xfa_textlayout.cpp » ('j') | no next file with comments »