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

[gsubgpos] Minor

This commit is contained in:
Behdad Esfahbod 2019-05-10 13:17:41 -07:00
parent 6d63e27ca4
commit cd9bc732a7
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/hb-ot-layout-gsubgpos.hh
View File

@ -2504,11 +2504,7 @@ struct ExtensionFormat1
template <typename X> template <typename X>
const X& get_subtable () const const X& get_subtable () const
{ { return this + (LOffsetTo<typename T::SubTable>&) extensionOffset; }
unsigned int offset = extensionOffset;
if (unlikely (!offset)) return Null(typename T::SubTable);
return StructAtOffset<typename T::SubTable> (this, offset);
}
template <typename context_t, typename ...Ts> template <typename context_t, typename ...Ts>
typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const
@ -2523,7 +2519,6 @@ struct ExtensionFormat1
{ {
TRACE_SANITIZE (this); TRACE_SANITIZE (this);
return_trace (c->check_struct (this) && return_trace (c->check_struct (this) &&
extensionOffset != 0 &&
extensionLookupType != T::SubTable::Extension); extensionLookupType != T::SubTable::Extension);
} }
@ -2532,7 +2527,7 @@ struct ExtensionFormat1
HBUINT16 extensionLookupType; /* Lookup type of subtable referenced HBUINT16 extensionLookupType; /* Lookup type of subtable referenced
* by ExtensionOffset (i.e. the * by ExtensionOffset (i.e. the
* extension subtable). */ * extension subtable). */
HBUINT32 extensionOffset; /* Offset to the extension subtable, Offset32 extensionOffset; /* Offset to the extension subtable,
* of lookup type subtable. */ * of lookup type subtable. */
public: public:
DEFINE_SIZE_STATIC (8); DEFINE_SIZE_STATIC (8);