diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-01-08 17:01:49 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-01-11 07:35:43 +0100 |
| commit | f14b9d30293f180500fc56d81e5390021758e7c1 (patch) | |
| tree | a6cd0b853169203cfa0953230e6774e7b1dd81b4 /vcl/source/fontsubset | |
| parent | d11120b95ee27cb4b05db466ed07f7a996dda125 (diff) | |
convert (a>b?a:b) to std::max(a,b)
with something like:
git grep -nP '(.*)\s*>\s*(.*)\s*\?\s*\g1\s*:\s*\g2'
Change-Id: I60b9a3a2a09162bc0de4c13fdde2c209696e5413
Reviewed-on: https://gerrit.libreoffice.org/47602
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/source/fontsubset')
| -rw-r--r-- | vcl/source/fontsubset/sft.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx index 098d54b41b2d..98cf6998bef0 100644 --- a/vcl/source/fontsubset/sft.cxx +++ b/vcl/source/fontsubset/sft.cxx @@ -595,14 +595,14 @@ static int GetCompoundTTOutline(TrueTypeFont *ttf, sal_uInt32 glyphID, ControlPo abs1 = (a < 0) ? -a : a; abs2 = (b < 0) ? -b : b; - m = (abs1 > abs2) ? abs1 : abs2; + m = std::max(abs1, abs2); abs3 = abs1 - abs2; if (abs3 < 0) abs3 = -abs3; if (abs3 <= 33) m *= 2; abs1 = (c < 0) ? -c : c; abs2 = (d < 0) ? -d : d; - n = (abs1 > abs2) ? abs1 : abs2; + n = std::max(abs1, abs2); abs3 = abs1 - abs2; if (abs3 < 0) abs3 = -abs3; if (abs3 <= 33) n *= 2; |