walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[HB] Fix for dfont's with multiple faces

This commit is contained in:
Behdad Esfahbod 2009-08-01 19:10:41 -04:00
parent e97a95f2ea
commit 23af767a44
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/hb-ot-layout-open-private.h
View File

@ -470,9 +470,11 @@ struct OpenTypeFontFile
} }
const OpenTypeFontFace& get_face (unsigned int i) const const OpenTypeFontFace& get_face (unsigned int i) const
{ {
if (HB_UNLIKELY (i >= get_face_count ())) return Null(OpenTypeFontFace);
switch (tag) { switch (tag) {
default: /* Never happens because of the if above */ default: return Null(OpenTypeFontFace);
/* Note: for non-collection SFNT data we ignore index. This is because
* Apple dfont container is a container of SFNT's. So each SFNT is a
* non-TTC, but the index is more than zero. */
case TrueTypeTag: case CFFTag: return *(const OffsetTable*)this; case TrueTypeTag: case CFFTag: return *(const OffsetTable*)this;
case TTCTag: return this+TTCHeader::get_for_data ((const char *) this).table[i]; case TTCTag: return this+TTCHeader::get_for_data ((const char *) this).table[i];
} }