diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-10-02 12:28:32 -0700 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-10-02 12:28:32 -0700 |
| commit | ea5c4d3929928b318b339231804580d93a6e5f21 (patch) | |
| tree | e4716d176a1326e823ff075ffad74e1236206de0 /core/src/fxge/ge | |
| parent | 9e75b82d5d18f748b260202fed5a59682631475c (diff) | |
| download | pdfium-ea5c4d3929928b318b339231804580d93a6e5f21.tar.xz | |
Merge to XFA: Turn a couple functions that always return true to return void.
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1386463003 .
(cherry picked from commit dcfa0ba2928072c962fe8835d1a2ccd309eafbbd)
Review URL: https://codereview.chromium.org/1379093003 .
Diffstat (limited to 'core/src/fxge/ge')
| -rw-r--r-- | core/src/fxge/ge/fx_ge_font.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/core/src/fxge/ge/fx_ge_font.cpp b/core/src/fxge/ge/fx_ge_font.cpp index aa19c58b05..468033eb01 100644 --- a/core/src/fxge/ge/fx_ge_font.cpp +++ b/core/src/fxge/ge/fx_ge_font.cpp @@ -116,13 +116,13 @@ void CFX_Font::DeleteFace() { FXFT_Done_Face(m_Face); m_Face = NULL; } -FX_BOOL CFX_Font::LoadSubst(const CFX_ByteString& face_name, - FX_BOOL bTrueType, - FX_DWORD flags, - int weight, - int italic_angle, - int CharsetCP, - FX_BOOL bVertical) { +void CFX_Font::LoadSubst(const CFX_ByteString& face_name, + FX_BOOL bTrueType, + FX_DWORD flags, + int weight, + int italic_angle, + int CharsetCP, + FX_BOOL bVertical) { m_bEmbedded = FALSE; m_bVertical = bVertical; m_pSubstFont = new CFX_SubstFont; @@ -139,7 +139,6 @@ FX_BOOL CFX_Font::LoadSubst(const CFX_ByteString& face_name, m_pFontData = FXFT_Get_Face_Stream_Base(m_Face); m_dwSize = FXFT_Get_Face_Stream_Size(m_Face); } - return TRUE; } extern "C" { unsigned long _FTStreamRead(FXFT_Stream stream, |