diff options
| author | dsinclair <dsinclair@chromium.org> | 2016-05-19 11:37:20 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-05-19 11:37:20 -0700 |
| commit | f8d8ac4fca2774550f3fbd3a21bbc1e326028c18 (patch) | |
| tree | 70ab1f2ba023573e5ae076e46ab2621a9411b28b /xfa/fgas/font/fgas_gefont.cpp | |
| parent | bc8a64029f898286c3dcad3a6cecdc98ef30b139 (diff) | |
| download | pdfium-f8d8ac4fca2774550f3fbd3a21bbc1e326028c18.tar.xz | |
Expand some typedefs to the original types
Sevearal typedefs are only used once or twice. Expand and remove the typedef.
Review-Url: https://codereview.chromium.org/1995033002
Diffstat (limited to 'xfa/fgas/font/fgas_gefont.cpp')
| -rw-r--r-- | xfa/fgas/font/fgas_gefont.cpp | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/xfa/fgas/font/fgas_gefont.cpp b/xfa/fgas/font/fgas_gefont.cpp index 5dfdb70018..c877080ec1 100644 --- a/xfa/fgas/font/fgas_gefont.cpp +++ b/xfa/fgas/font/fgas_gefont.cpp @@ -299,24 +299,20 @@ FX_BOOL CFX_GEFont::LoadFont(CFX_Font* pExtFont, FX_BOOL bTakeOver) { return bRet; } FX_BOOL CFX_GEFont::InitFont() { - if (!m_pFont) { + if (!m_pFont) return FALSE; - } if (!m_pFontEncoding) { m_pFontEncoding = FX_CreateFontEncodingEx(m_pFont); - if (!m_pFontEncoding) { + if (!m_pFontEncoding) return FALSE; - } } - if (!m_pCharWidthMap) { + if (!m_pCharWidthMap) m_pCharWidthMap = new CFX_WordDiscreteArray(1024); - } - if (!m_pRectArray) { - m_pRectArray = new CFX_RectMassArray(16); - } - if (!m_pBBoxMap) { + if (!m_pRectArray) + m_pRectArray = new CFX_MassArrayTemplate<CFX_Rect>(16); + if (!m_pBBoxMap) m_pBBoxMap = new CFX_MapPtrToPtr(16); - } + return TRUE; } IFX_Font* CFX_GEFont::Derive(uint32_t dwFontStyles, uint16_t wCodePage) { |