diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-11-04 09:46:42 -0800 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-11-04 09:46:42 -0800 |
| commit | 5dbbc6bf047daceb952ae774346a2e74f002ec46 (patch) | |
| tree | 5d85570135d12afeae79b7601c0f7605d3bf40ff /core/include/fxge/fx_font.h | |
| parent | 4a8eeb74d38a1589c21ec06b68262d7795dd8f71 (diff) | |
| download | pdfium-5dbbc6bf047daceb952ae774346a2e74f002ec46.tar.xz | |
Merge to XFA: Make built-in font table slightly saner.
Original Review URL: https://codereview.chromium.org/1409243012 .
(cherry picked from commit 0142f017d03df17fac98b586487cae23b6be05a6)
R=thestig@chromium.org
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1429183002 .
Diffstat (limited to 'core/include/fxge/fx_font.h')
| -rw-r--r-- | core/include/fxge/fx_font.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/core/include/fxge/fx_font.h b/core/include/fxge/fx_font.h index d49c553521..ccd9bf308a 100644 --- a/core/include/fxge/fx_font.h +++ b/core/include/fxge/fx_font.h @@ -218,10 +218,7 @@ class CFX_SubstFont { #define FX_FONT_FLAG_SYMBOLIC_SYMBOL 0x10 #define FX_FONT_FLAG_SYMBOLIC_DINGBATS 0x20 #define FX_FONT_FLAG_MULTIPLEMASTER 0x40 -typedef struct { - const uint8_t* m_pFontData; - FX_DWORD m_dwSize; -} FoxitFonts; + class CFX_FontMgr { public: CFX_FontMgr(); @@ -259,7 +256,7 @@ class CFX_FontMgr { int italic_angle, int CharsetCP, CFX_SubstFont* pSubstFont); - FX_BOOL GetStandardFont(const uint8_t*& pFontData, FX_DWORD& size, int index); + bool GetBuiltinFont(size_t index, const uint8_t** pFontData, FX_DWORD* size); CFX_FontMapper* GetBuiltinMapper() const { return m_pBuiltinMapper.get(); } FXFT_Library GetFTLibrary() const { return m_FTLibrary; } |