diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-10-02 10:34:27 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-10-02 14:45:29 +0000 |
| commit | 522e100534c78b026d170d5625c1e72046a6953c (patch) | |
| tree | 23513b5708db0690237026872b9610e728ce56df | |
| parent | 59dfc62e56ec5dd88e5445e13467e0e1a3f1690f (diff) | |
| download | pdfium-522e100534c78b026d170d5625c1e72046a6953c.tar.xz | |
Use std::make_tuple
This CL updates cfx_fontmapper to use std::make_tuple instead of the {}
variant.
Change-Id: I1eeeeed803fd4b813f3dbf7b3d23416af9400b6f
Reviewed-on: https://pdfium-review.googlesource.com/15131
Reviewed-by: dsinclair <dsinclair@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
| -rw-r--r-- | core/fxge/cfx_fontmapper.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/fxge/cfx_fontmapper.cpp b/core/fxge/cfx_fontmapper.cpp index 362e9bc0b4..00372885f6 100644 --- a/core/fxge/cfx_fontmapper.cpp +++ b/core/fxge/cfx_fontmapper.cpp @@ -243,7 +243,7 @@ const struct FX_FontStyle { std::tuple<bool, uint32_t, size_t> GetStyleType(const ByteString& bsStyle, bool bReverse) { if (bsStyle.IsEmpty()) - return {false, FXFONT_NORMAL, 0}; + return std::make_tuple(false, FXFONT_NORMAL, 0); for (int i = FX_ArraySize(g_FontStyles) - 1; i >= 0; --i) { const FX_FontStyle* pStyle = g_FontStyles + i; @@ -252,13 +252,13 @@ std::tuple<bool, uint32_t, size_t> GetStyleType(const ByteString& bsStyle, if (bReverse) { if (bsStyle.Right(pStyle->len).Compare(pStyle->name) == 0) - return {true, pStyle->style, pStyle->len}; + return std::make_tuple(true, pStyle->style, pStyle->len); } else { if (bsStyle.Left(pStyle->len).Compare(pStyle->name) == 0) - return {true, pStyle->style, pStyle->len}; + return std::make_tuple(true, pStyle->style, pStyle->len); } } - return {false, FXFONT_NORMAL, 0}; + return std::make_tuple(false, FXFONT_NORMAL, 0); } bool CheckSupportThirdPartFont(ByteString name, int& PitchFamily) { |