diff options
| author | Nicolas Pena <npm@chromium.org> | 2017-05-25 10:43:36 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-05-25 15:00:31 +0000 |
| commit | e0e2cd4f8a5634f2878f9b3bf3ce321ffd53a980 (patch) | |
| tree | d270bb98a411c1c6797cec95c614a714e9d20336 /core/fxge/fx_font.h | |
| parent | 13115ecf2087f5db33deea16dd1c72c7b976cafd (diff) | |
| download | pdfium-e0e2cd4f8a5634f2878f9b3bf3ce321ffd53a980.tar.xz | |
Cleanup some nits in CFX_Font
Change-Id: I30b59c794fc855fd36c33da3c60053ae08b3dac1
Reviewed-on: https://pdfium-review.googlesource.com/5910
Reviewed-by: dsinclair <dsinclair@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'core/fxge/fx_font.h')
| -rw-r--r-- | core/fxge/fx_font.h | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/core/fxge/fx_font.h b/core/fxge/fx_font.h index 946c713418..5ef1a7d65e 100644 --- a/core/fxge/fx_font.h +++ b/core/fxge/fx_font.h @@ -100,8 +100,7 @@ class CFX_Font { #ifdef PDF_ENABLE_XFA bool LoadFile(const CFX_RetainPtr<IFX_SeekableReadStream>& pFile, - int nFaceIndex = 0, - int* pFaceCount = nullptr); + int nFaceIndex); bool LoadClone(const CFX_Font* pFont); void SetFace(FXFT_Face face); @@ -135,10 +134,6 @@ class CFX_Font { CFX_ByteString GetFaceName() const; bool IsTTFont() const; bool GetBBox(FX_RECT& bbox); - int GetHeight() const; - int GetULPos() const; - int GetULthickness() const; - int GetMaxAdvanceWidth() const; bool IsEmbedded() const { return m_bEmbedded; } uint8_t* GetSubData() const { return m_pGsubData; } void SetSubData(uint8_t* data) { m_pGsubData = data; } @@ -165,8 +160,7 @@ class CFX_Font { private: friend class CFX_FaceCache; - CFX_PathData* LoadGlyphPathImpl(uint32_t glyph_index, - int dest_width = 0) const; + CFX_PathData* LoadGlyphPathImpl(uint32_t glyph_index, int dest_width) const; CFX_FaceCache* GetFaceCache() const; void ReleasePlatformResource(); void DeleteFace(); @@ -231,8 +225,8 @@ class FXTEXT_GLYPHPOS { FX_RECT FXGE_GetGlyphsBBox(const std::vector<FXTEXT_GLYPHPOS>& glyphs, int anti_alias, - float retinaScaleX = 1.0f, - float retinaScaleY = 1.0f); + float retinaScaleX, + float retinaScaleY); CFX_ByteString GetNameFromTT(const uint8_t* name_table, uint32_t name_table_size, |