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

.

This commit is contained in:
Behdad Esfahbod 2021-03-31 15:26:42 -06:00
parent c539afb08b
commit 2a54c9f744
3 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -715,12 +715,9 @@ using LArrayOf = ArrayOf<Type, HBUINT32>;
using PString = ArrayOf<HBUINT8, HBUINT8>; using PString = ArrayOf<HBUINT8, HBUINT8>;
/* Array of Offset's */ /* Array of Offset's */
template <typename Type> template <typename Type> using OffsetArrayOf = ArrayOf<OffsetTo<Type, HBUINT16>, HBUINT16>;
using OffsetArrayOf = ArrayOf<OffsetTo<Type, HBUINT16>>; template <typename Type> using Array16OfOffset32To = ArrayOf<OffsetTo<Type, HBUINT32>>;
template <typename Type> template <typename Type> using Array32OfOffset32To = ArrayOf<OffsetTo<Type, HBUINT32>, HBUINT32>;
using LOffsetArrayOf = ArrayOf<OffsetTo<Type, HBUINT32>>;
template <typename Type>
using LOffsetLArrayOf = ArrayOf<OffsetTo<Type, HBUINT32>, HBUINT32>;
/* 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>

4
src/hb-ot-color-sbix-table.hh
View File

@ -352,7 +352,7 @@ struct sbix
{ {
TRACE_SERIALIZE (this); TRACE_SERIALIZE (this);
auto *out = c->serializer->start_embed<LOffsetLArrayOf<SBIXStrike>> (); auto *out = c->serializer->start_embed<Array32OfOffset32To<SBIXStrike>> ();
if (unlikely (!out)) return_trace (false); if (unlikely (!out)) return_trace (false);
if (unlikely (!c->serializer->extend_min (out))) return_trace (false); if (unlikely (!c->serializer->extend_min (out))) return_trace (false);
@ -400,7 +400,7 @@ struct sbix
HBUINT16 version; /* Table version number — set to 1 */ HBUINT16 version; /* Table version number — set to 1 */
HBUINT16 flags; /* Bit 0: Set to 1. Bit 1: Draw outlines. HBUINT16 flags; /* Bit 0: Set to 1. Bit 1: Draw outlines.
* Bits 2 to 15: reserved (set to 0). */ * Bits 2 to 15: reserved (set to 0). */
LOffsetLArrayOf<SBIXStrike> Array32OfOffset32To<SBIXStrike>
strikes; /* Offsets from the beginning of the 'sbix' strikes; /* Offsets from the beginning of the 'sbix'
* table to data for each individual bitmap strike. */ * table to data for each individual bitmap strike. */
public: public:

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

@ -2862,7 +2862,7 @@ struct VariationStore
protected: protected:
HBUINT16 format; HBUINT16 format;
Offset32To<VarRegionList> regions; Offset32To<VarRegionList> regions;
LOffsetArrayOf<VarData> dataSets; Array16OfOffset32To<VarData> dataSets;
public: public:
DEFINE_SIZE_ARRAY (8, dataSets); DEFINE_SIZE_ARRAY (8, dataSets);
}; };
@ -2975,7 +2975,7 @@ struct ConditionSet
} }
protected: protected:
LOffsetArrayOf<Condition> conditions; Array16OfOffset32To<Condition> conditions;
public: public:
DEFINE_SIZE_ARRAY (2, conditions); DEFINE_SIZE_ARRAY (2, conditions);
}; };