diff options
author | Jonathan Kew <jfkthame@googlemail.com> | 2006-09-07 10:00:56 +0000 |
---|---|---|
committer | Jonathan Kew <jfkthame@googlemail.com> | 2006-09-07 10:00:56 +0000 |
commit | bc784de6a2b45e06374f41e4c658fb7d77fa04b8 (patch) | |
tree | 849bb11cd3b3cfd0bb5a703506382ad374d8fd37 /Build/source/texk/web2c/xetexdir/XeTeXFontInst.cpp | |
parent | 9a4cd922ac26125fc6de1f680a8ffca74af04956 (diff) |
xetex source update, synced with xetex repo rev.365
git-svn-id: svn://tug.org/texlive/trunk@2093 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/xetexdir/XeTeXFontInst.cpp')
-rw-r--r-- | Build/source/texk/web2c/xetexdir/XeTeXFontInst.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Build/source/texk/web2c/xetexdir/XeTeXFontInst.cpp b/Build/source/texk/web2c/xetexdir/XeTeXFontInst.cpp index b11138b920b..c598b9c96a1 100644 --- a/Build/source/texk/web2c/xetexdir/XeTeXFontInst.cpp +++ b/Build/source/texk/web2c/xetexdir/XeTeXFontInst.cpp @@ -56,9 +56,8 @@ authorization from SIL International. #include <string.h> -XeTeXFontInst::XeTeXFontInst(PlatformFontRef fontRef, float pointSize, LEErrorCode &status) - : fFontRef(fontRef) - , fPointSize(pointSize) +XeTeXFontInst::XeTeXFontInst(float pointSize, LEErrorCode &status) + : fPointSize(pointSize) , fUnitsPerEM(0) , fAscent(0) , fDescent(0) @@ -71,6 +70,7 @@ XeTeXFontInst::XeTeXFontInst(PlatformFontRef fontRef, float pointSize, LEErrorCo , fNumGlyphs(0) , fNumGlyphsInited(false) , fVertical(false) + , fFilename(NULL) { // the concrete subclass is responsible to call initialize() } @@ -291,5 +291,8 @@ XeTeXFontInst::mapGlyphToIndex(const char* glyphName) const { le_uint32 len; const char *p = (const char*)readFontTable(LE_POST_TABLE_TAG, len); - return findGlyphInPostTable(p, len, glyphName); + if (p != NULL) + return findGlyphInPostTable(p, len, glyphName); + else + return 0; } |