[HB] Minor
This commit is contained in:
parent
a080b1cc2f
commit
a21b5062cc
|
@ -199,17 +199,17 @@ struct GDEF
|
||||||
/* XXX check version here? */
|
/* XXX check version here? */
|
||||||
|
|
||||||
inline bool has_glyph_classes () const { return glyphClassDef != 0; }
|
inline bool has_glyph_classes () const { return glyphClassDef != 0; }
|
||||||
inline hb_ot_layout_class_t get_glyph_class (hb_codepoint_t glyph) const { return glyphClassDef(this).get_class (glyph); }
|
inline hb_ot_layout_class_t get_glyph_class (hb_codepoint_t glyph) const { return (this+glyphClassDef).get_class (glyph); }
|
||||||
|
|
||||||
inline bool has_mark_attachment_types () const { return markAttachClassDef != 0; }
|
inline bool has_mark_attachment_types () const { return markAttachClassDef != 0; }
|
||||||
inline hb_ot_layout_class_t get_mark_attachment_type (hb_codepoint_t glyph) const { return markAttachClassDef(this).get_class (glyph); }
|
inline hb_ot_layout_class_t get_mark_attachment_type (hb_codepoint_t glyph) const { return (this+markAttachClassDef).get_class (glyph); }
|
||||||
|
|
||||||
/* TODO get_attach and get_lig_caret */
|
/* TODO get_attach and get_lig_caret */
|
||||||
inline bool has_attach_list () const { return attachList != 0; }
|
inline bool has_attach_list () const { return attachList != 0; }
|
||||||
inline bool has_lig_caret_list () const { return ligCaretList != 0; }
|
inline bool has_lig_caret_list () const { return ligCaretList != 0; }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
Fixed version; /* Version of the GDEF table--initially
|
Fixed_Version version; /* Version of the GDEF table--initially
|
||||||
* 0x00010000 */
|
* 0x00010000 */
|
||||||
OffsetTo<ClassDef>
|
OffsetTo<ClassDef>
|
||||||
glyphClassDef; /* Offset to class definition table
|
glyphClassDef; /* Offset to class definition table
|
||||||
|
|
|
@ -173,7 +173,6 @@ struct Null <Type> \
|
||||||
if (HB_UNLIKELY (data == NULL)) return Null(Type); \
|
if (HB_UNLIKELY (data == NULL)) return Null(Type); \
|
||||||
return (const Type&)*data; \
|
return (const Type&)*data; \
|
||||||
} \
|
} \
|
||||||
static inline Type& get_for_data (char *data) { return (Type&)*data; }
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -511,7 +510,8 @@ struct OpenTypeFontFile
|
||||||
{
|
{
|
||||||
if (HB_UNLIKELY (i >= get_len ())) return Null(OpenTypeFontFace);
|
if (HB_UNLIKELY (i >= get_len ())) return Null(OpenTypeFontFace);
|
||||||
switch (tag) {
|
switch (tag) {
|
||||||
default: case TrueTypeTag: case CFFTag: return (const OffsetTable&)*this;
|
default: /* Never happens because of the if above */
|
||||||
|
case TrueTypeTag: case CFFTag: return (const OffsetTable&)*this;
|
||||||
case TTCTag: return ((const TTCHeader&)*this)[i];
|
case TTCTag: return ((const TTCHeader&)*this)[i];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue