diff options
| author | Eugene Sandulenko | 2017-01-17 00:33:16 +0100 |
|---|---|---|
| committer | Eugene Sandulenko | 2017-01-17 00:33:34 +0100 |
| commit | 13422c315188075f2fdbe20543610239150cf347 (patch) | |
| tree | b9278f3a05f07373df4f77a36dea0972b44c4060 /graphics/fonts/macfont.h | |
| parent | 66453dac06e9a3a815d2cf755fab610ed2c72071 (diff) | |
| download | scummvm-rg350-13422c315188075f2fdbe20543610239150cf347.tar.gz scummvm-rg350-13422c315188075f2fdbe20543610239150cf347.tar.bz2 scummvm-rg350-13422c315188075f2fdbe20543610239150cf347.zip | |
GRAPHICS: More work on FOND loading
Diffstat (limited to 'graphics/fonts/macfont.h')
| -rw-r--r-- | graphics/fonts/macfont.h | 43 |
1 files changed, 29 insertions, 14 deletions
diff --git a/graphics/fonts/macfont.h b/graphics/fonts/macfont.h index e006fee0d1..40a54f2087 100644 --- a/graphics/fonts/macfont.h +++ b/graphics/fonts/macfont.h @@ -28,20 +28,6 @@ namespace Graphics { -struct AsscEntry { - uint16 _fontSize; - uint16 _fontStyle; - uint16 _fontID; -}; - -struct BBoxEntry { - uint16 _style; - uint16 _left; - uint16 _bottom; - uint16 _right; - uint16 _top; -}; - /** * Processing of Mac FONT/NFNT rResources */ @@ -90,15 +76,44 @@ private: uint16 _ffIntl[2]; uint16 _ffVersion; + struct AsscEntry { + uint16 _fontSize; + uint16 _fontStyle; + uint16 _fontID; + }; + uint16 _ffNumAssoc; Common::Array<AsscEntry> _ffAssocEntries; uint16 _ffNumOffsets; uint32 *_ffOffsets; + struct BBoxEntry { + uint16 _style; + uint16 _left; + uint16 _bottom; + uint16 _right; + uint16 _top; + }; + uint16 _ffNumBBoxes; Common::Array<BBoxEntry> _ffBBoxes; + struct KernPair { + byte _firstChar; + byte _secondChar; + uint16 _distance; + }; + + struct KernEntry { + uint16 _style; + uint16 _entryLength; + Common::Array<KernPair> _kernPairs; + }; + + uint16 _ffNumKerns; + Common::Array<KernEntry> _ffKernEntries; + byte *_bitImage; struct Glyph { |