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

Rename (Unsized)OffsetListOf

This commit is contained in:
Behdad Esfahbod 2021-03-31 15:33:22 -06:00
parent 6c4e0491d7
commit 5efe360986
6 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/hb-aat-layout-morx-table.hh
View File

@ -304,7 +304,7 @@ struct ContextualSubtable
bool mark_set; bool mark_set;
unsigned int mark; unsigned int mark;
const ContextualSubtable *table; const ContextualSubtable *table;
const UnsizedOffsetListOf<Lookup<HBGlyphID>, HBUINT, false> &subs; const UnsizedListOfOffset16To<Lookup<HBGlyphID>, HBUINT, false> &subs;
}; };
bool apply (hb_aat_apply_context_t *c) const bool apply (hb_aat_apply_context_t *c) const
@ -348,7 +348,7 @@ struct ContextualSubtable
protected: protected:
StateTable<Types, EntryData> StateTable<Types, EntryData>
machine; machine;
NNOffsetTo<UnsizedOffsetListOf<Lookup<HBGlyphID>, HBUINT, false>, HBUINT> NNOffsetTo<UnsizedListOfOffset16To<Lookup<HBGlyphID>, HBUINT, false>, HBUINT>
substitutionTables; substitutionTables;
public: public:
DEFINE_SIZE_STATIC (20); DEFINE_SIZE_STATIC (20);

6
src/hb-open-type.hh
View File

@ -528,7 +528,7 @@ using UnsizedArray16OfOffsetTo = UnsizedArrayOf<OffsetTo<Type, OffsetType, has_n
/* Unsized array of offsets relative to the beginning of the array itself. */ /* Unsized array of offsets relative to the beginning of the array itself. */
template <typename Type, typename OffsetType, bool has_null=true> template <typename Type, typename OffsetType, bool has_null=true>
struct UnsizedOffsetListOf : UnsizedArray16OfOffsetTo<Type, OffsetType, has_null> struct UnsizedListOfOffset16To : UnsizedArray16OfOffsetTo<Type, OffsetType, has_null>
{ {
const Type& operator [] (int i_) const const Type& operator [] (int i_) const
{ {
@ -721,7 +721,7 @@ template <typename Type> using Array32OfOffset32To = ArrayOf<OffsetTo<Type, HBUI
/* Array of offsets relative to the beginning of the array itself. */ /* Array of offsets relative to the beginning of the array itself. */
template <typename Type> template <typename Type>
struct OffsetListOf : Array16OfOffset16To<Type> struct List16OfOffset16To : Array16OfOffset16To<Type>
{ {
const Type& operator [] (int i_) const const Type& operator [] (int i_) const
{ {
@ -739,7 +739,7 @@ struct OffsetListOf : Array16OfOffset16To<Type>
bool subset (hb_subset_context_t *c) const bool subset (hb_subset_context_t *c) const
{ {
TRACE_SUBSET (this); TRACE_SUBSET (this);
struct OffsetListOf<Type> *out = c->serializer->embed (*this); struct List16OfOffset16To<Type> *out = c->serializer->embed (*this);
if (unlikely (!out)) return_trace (false); if (unlikely (!out)) return_trace (false);
unsigned int count = this->len; unsigned int count = this->len;
for (unsigned int i = 0; i < count; i++) for (unsigned int i = 0; i < count; i++)

8
src/hb-ot-layout-common.hh
View File

@ -1343,10 +1343,10 @@ struct Lookup
DEFINE_SIZE_ARRAY (6, subTable); DEFINE_SIZE_ARRAY (6, subTable);
}; };
typedef OffsetListOf<Lookup> LookupList; typedef List16OfOffset16To<Lookup> LookupList;
template <typename TLookup> template <typename TLookup>
struct LookupOffsetList : OffsetListOf<TLookup> struct LookupOffsetList : List16OfOffset16To<TLookup>
{ {
bool subset (hb_subset_context_t *c, bool subset (hb_subset_context_t *c,
hb_subset_layout_context_t *l) const hb_subset_layout_context_t *l) const
@ -1367,7 +1367,7 @@ struct LookupOffsetList : OffsetListOf<TLookup>
bool sanitize (hb_sanitize_context_t *c) const bool sanitize (hb_sanitize_context_t *c) const
{ {
TRACE_SANITIZE (this); TRACE_SANITIZE (this);
return_trace (OffsetListOf<TLookup>::sanitize (c, this)); return_trace (List16OfOffset16To<TLookup>::sanitize (c, this));
} }
}; };
@ -2786,7 +2786,7 @@ struct VariationStore
.serialize (c, &(src+src->regions), region_map))) return_trace (false); .serialize (c, &(src+src->regions), region_map))) return_trace (false);
/* TODO: The following code could be simplified when /* TODO: The following code could be simplified when
* OffsetListOf::subset () can take a custom param to be passed to VarData::serialize () * List16OfOffset16To::subset () can take a custom param to be passed to VarData::serialize ()
*/ */
dataSets.len = set_count; dataSets.len = set_count;
unsigned int set_index = 0; unsigned int set_index = 0;

2
src/hb-ot-layout-gpos-table.hh
View File

@ -2049,7 +2049,7 @@ typedef AnchorMatrix LigatureAttach; /* component-major--
* ordered by class--zero-based. */ * ordered by class--zero-based. */
/* Array of LigatureAttach tables ordered by LigatureCoverage Index */ /* Array of LigatureAttach tables ordered by LigatureCoverage Index */
struct LigatureArray : OffsetListOf<LigatureAttach> struct LigatureArray : List16OfOffset16To<LigatureAttach>
{ {
template <typename Iterator, template <typename Iterator,
hb_requires (hb_is_iterator (Iterator))> hb_requires (hb_is_iterator (Iterator))>

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

@ -3745,7 +3745,7 @@ struct GSUBGPOS
bool sanitize (hb_sanitize_context_t *c) const bool sanitize (hb_sanitize_context_t *c) const
{ {
TRACE_SANITIZE (this); TRACE_SANITIZE (this);
typedef OffsetListOf<TLookup> TLookupList; typedef List16OfOffset16To<TLookup> TLookupList;
if (unlikely (!(version.sanitize (c) && if (unlikely (!(version.sanitize (c) &&
likely (version.major == 1) && likely (version.major == 1) &&
scriptList.sanitize (c, this) && scriptList.sanitize (c, this) &&

6
src/hb-ot-layout-jstf-table.hh
View File

@ -45,7 +45,7 @@ typedef IndexArray JstfModList;
* JstfMax -- Justification Maximum Table * JstfMax -- Justification Maximum Table
*/ */
typedef OffsetListOf<PosLookup> JstfMax; typedef List16OfOffset16To<PosLookup> JstfMax;
/* /*
@ -121,13 +121,13 @@ struct JstfPriority
* JstfLangSys -- Justification Language System Table * JstfLangSys -- Justification Language System Table
*/ */
struct JstfLangSys : OffsetListOf<JstfPriority> struct JstfLangSys : List16OfOffset16To<JstfPriority>
{ {
bool sanitize (hb_sanitize_context_t *c, bool sanitize (hb_sanitize_context_t *c,
const Record_sanitize_closure_t * = nullptr) const const Record_sanitize_closure_t * = nullptr) const
{ {
TRACE_SANITIZE (this); TRACE_SANITIZE (this);
return_trace (OffsetListOf<JstfPriority>::sanitize (c)); return_trace (List16OfOffset16To<JstfPriority>::sanitize (c));
} }
}; };