diff options
author | Jonathan Kew <jfkthame@googlemail.com> | 2008-02-08 17:28:24 +0000 |
---|---|---|
committer | Jonathan Kew <jfkthame@googlemail.com> | 2008-02-08 17:28:24 +0000 |
commit | d930e60f53da36d97d91f77e00d01c242f4aba37 (patch) | |
tree | 10508a97e179a73aaca1fcc9d79a3de24026bfd4 /Build/source/libs/graphite-engine/include/graphite/FileFont.h | |
parent | fcfc8e4880e9573c7c7e54476667079a8269f0fb (diff) |
graphite update (synch with XeTeX repository rev.562)
git-svn-id: svn://tug.org/texlive/trunk@6568 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/graphite-engine/include/graphite/FileFont.h')
-rw-r--r-- | Build/source/libs/graphite-engine/include/graphite/FileFont.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/Build/source/libs/graphite-engine/include/graphite/FileFont.h b/Build/source/libs/graphite-engine/include/graphite/FileFont.h index cffef0b79bc..bbb26266c71 100644 --- a/Build/source/libs/graphite-engine/include/graphite/FileFont.h +++ b/Build/source/libs/graphite-engine/include/graphite/FileFont.h @@ -209,7 +209,7 @@ public: m_yScale = scaleFromDpi(dpi); } - bool isValid() { return m_isValid; }; + bool isValid() { return m_fIsValid; }; protected: /** Default constructor is not used */ FileFont(); @@ -225,10 +225,11 @@ protected: // pixel-coord = design-coord * pixels-per-em / font-em-square float scaleFromDpi(int dpi) { - return (dpi * m_pointSize) / (72.0f * m_emSquare); + return (dpi * m_pointSize) / (72.0f * m_mEmSquare); } + // Member variables: - FILE *m_file; + FILE * m_pfile; unsigned long m_clrFore; unsigned long m_clrBack; @@ -238,14 +239,14 @@ protected: FontTableCache * m_pTableCache; // KRS: I think these should be cached otherwise Segment::LineContextSegment doesn't work - float m_ascent; - float m_descent; - float m_emSquare; + float m_mAscent; + float m_mDescent; + float m_mEmSquare; float m_pointSize; int m_dpiX; int m_dpiY; - bool m_isValid; - std::wstring m_faceName; + bool m_fIsValid; + std::wstring m_stuFaceName; byte * m_pHeader; byte * m_pTableDir; float m_xScale; |