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

[GX] Make FeatureVariations actually work 

Yay!!!!
This commit is contained in:
Behdad Esfahbod 2016-09-10 04:52:34 -07:00
parent 72ada4f0c6
commit 4ebbeb7c50
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/hb-ot-layout-common-private.hh
View File

@ -1417,17 +1417,12 @@ struct ConditionSet
struct FeatureTableSubstitutionRecord struct FeatureTableSubstitutionRecord
{ {
inline const Feature *find_substitute (unsigned int feature_index) const friend struct FeatureTableSubstitution;
{
if (featureIndex == feature_index)
return &(this+feature);
return NULL;
}
inline bool sanitize (hb_sanitize_context_t *c) const inline bool sanitize (hb_sanitize_context_t *c, const void *base) const
{ {
TRACE_SANITIZE (this); TRACE_SANITIZE (this);
return_trace (c->check_struct (this) && feature.sanitize (c, this)); return_trace (c->check_struct (this) && feature.sanitize (c, base));
} }
protected: protected:
@ -1444,9 +1439,9 @@ struct FeatureTableSubstitution
unsigned int count = substitutions.len; unsigned int count = substitutions.len;
for (unsigned int i = 0; i < count; i++) for (unsigned int i = 0; i < count; i++)
{ {
const Feature *feature = (this+substitutions.array[i]).find_substitute (feature_index); const FeatureTableSubstitutionRecord &record = substitutions.array[i];
if (feature) if (record.featureIndex == feature_index)
return feature; return &(this+record.feature);
} }
return NULL; return NULL;
} }
@ -1461,7 +1456,7 @@ struct FeatureTableSubstitution
protected: protected:
FixedVersion<> version; /* Version--0x00010000u */ FixedVersion<> version; /* Version--0x00010000u */
OffsetArrayOf<FeatureTableSubstitutionRecord, ULONG> ArrayOf<FeatureTableSubstitutionRecord>
substitutions; substitutions;
public: public:
DEFINE_SIZE_ARRAY (6, substitutions); DEFINE_SIZE_ARRAY (6, substitutions);

3
src/hb-ot-layout-gsubgpos-private.hh
View File

@ -2281,7 +2281,8 @@ struct GSUBGPOS
if (FeatureVariations::NOT_FOUND_INDEX != variations_index && if (FeatureVariations::NOT_FOUND_INDEX != variations_index &&
version.to_int () >= 0x00010001u) version.to_int () >= 0x00010001u)
{ {
const Feature *feature = (this+featureVars).find_substitute (variations_index, feature_index); const Feature *feature = (this+featureVars).find_substitute (variations_index,
feature_index);
if (feature) if (feature)
return *feature; return *feature;
} }