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

s/LArrayOf/Array32Of/g

This commit is contained in:
Behdad Esfahbod 2021-03-31 15:34:26 -06:00
parent 5efe360986
commit 2520a82df9
8 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/hb-aat-layout-ankr-table.hh
View File

@ -54,7 +54,7 @@ struct Anchor
DEFINE_SIZE_STATIC (4); DEFINE_SIZE_STATIC (4);
}; };
typedef LArrayOf<Anchor> GlyphAnchors; typedef Array32Of<Anchor> GlyphAnchors;
struct ankr struct ankr
{ {

2
src/hb-aat-layout-just-table.hh
View File

@ -310,7 +310,7 @@ struct WidthDeltaPair
DEFINE_SIZE_STATIC (24); DEFINE_SIZE_STATIC (24);
}; };
typedef OT::LArrayOf<WidthDeltaPair> WidthDeltaCluster; typedef OT::Array32Of<WidthDeltaPair> WidthDeltaCluster;
struct JustificationCategory struct JustificationCategory
{ {

2
src/hb-aat-ltag-table.hh
View File

@ -80,7 +80,7 @@ struct ltag
protected: protected:
HBUINT32 version; /* Table version; currently 1 */ HBUINT32 version; /* Table version; currently 1 */
HBUINT32 flags; /* Table flags; currently none defined */ HBUINT32 flags; /* Table flags; currently none defined */
LArrayOf<FTStringRange> Array32Of<FTStringRange>
tagRanges; /* Range for each tag's string */ tagRanges; /* Range for each tag's string */
public: public:
DEFINE_SIZE_ARRAY (12, tagRanges); DEFINE_SIZE_ARRAY (12, tagRanges);

4
src/hb-open-file.hh
View File

@ -218,7 +218,7 @@ struct TTCHeaderVersion1
Tag ttcTag; /* TrueType Collection ID string: 'ttcf' */ Tag ttcTag; /* TrueType Collection ID string: 'ttcf' */
FixedVersion<>version; /* Version of the TTC Header (1.0), FixedVersion<>version; /* Version of the TTC Header (1.0),
* 0x00010000u */ * 0x00010000u */
LArrayOf<Offset32To<OpenTypeOffsetTable>> Array32Of<Offset32To<OpenTypeOffsetTable>>
table; /* Array of offsets to the OffsetTable for each font table; /* Array of offsets to the OffsetTable for each font
* from the beginning of the file */ * from the beginning of the file */
public: public:
@ -295,7 +295,7 @@ struct ResourceRecord
HBINT16 nameOffset; /* Offset from beginning of resource name list HBINT16 nameOffset; /* Offset from beginning of resource name list
* to resource name, -1 means there is none. */ * to resource name, -1 means there is none. */
HBUINT8 attrs; /* Resource attributes */ HBUINT8 attrs; /* Resource attributes */
NNOffset24To<LArrayOf<HBUINT8>> NNOffset24To<Array32Of<HBUINT8>>
offset; /* Offset from beginning of data block to offset; /* Offset from beginning of data block to
* data for this resource */ * data for this resource */
HBUINT32 reserved; /* Reserved for handle to resource */ HBUINT32 reserved; /* Reserved for handle to resource */

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

@ -711,12 +711,12 @@ struct ArrayOf
DEFINE_SIZE_ARRAY (sizeof (LenType), arrayZ); DEFINE_SIZE_ARRAY (sizeof (LenType), arrayZ);
}; };
template <typename Type> template <typename Type>
using LArrayOf = ArrayOf<Type, HBUINT32>; using Array32Of = ArrayOf<Type, HBUINT32>;
using PString = ArrayOf<HBUINT8, HBUINT8>; using PString = ArrayOf<HBUINT8, HBUINT8>;
/* Array of Offset's */ /* Array of Offset's */
template <typename Type> using Array16OfOffset16To = ArrayOf<OffsetTo<Type, HBUINT16>, HBUINT16>; template <typename Type> using Array16OfOffset16To = ArrayOf<OffsetTo<Type, HBUINT16>, HBUINT16>;
template <typename Type> using Array16OfOffset32To = ArrayOf<OffsetTo<Type, HBUINT32>>; template <typename Type> using Array16OfOffset32To = ArrayOf<OffsetTo<Type, HBUINT32>, HBUINT16>;
template <typename Type> using Array32OfOffset32To = ArrayOf<OffsetTo<Type, HBUINT32>, HBUINT32>; template <typename Type> using Array32OfOffset32To = 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. */

8
src/hb-ot-color-cbdt-table.hh
View File

@ -697,7 +697,7 @@ struct BitmapSizeTable
struct GlyphBitmapDataFormat17 struct GlyphBitmapDataFormat17
{ {
SmallGlyphMetrics glyphMetrics; SmallGlyphMetrics glyphMetrics;
LArrayOf<HBUINT8> data; Array32Of<HBUINT8> data;
public: public:
DEFINE_SIZE_ARRAY (9, data); DEFINE_SIZE_ARRAY (9, data);
}; };
@ -705,14 +705,14 @@ struct GlyphBitmapDataFormat17
struct GlyphBitmapDataFormat18 struct GlyphBitmapDataFormat18
{ {
BigGlyphMetrics glyphMetrics; BigGlyphMetrics glyphMetrics;
LArrayOf<HBUINT8> data; Array32Of<HBUINT8> data;
public: public:
DEFINE_SIZE_ARRAY (12, data); DEFINE_SIZE_ARRAY (12, data);
}; };
struct GlyphBitmapDataFormat19 struct GlyphBitmapDataFormat19
{ {
LArrayOf<HBUINT8> data; Array32Of<HBUINT8> data;
public: public:
DEFINE_SIZE_ARRAY (4, data); DEFINE_SIZE_ARRAY (4, data);
}; };
@ -798,7 +798,7 @@ struct CBLC
protected: protected:
FixedVersion<> version; FixedVersion<> version;
LArrayOf<BitmapSizeTable> sizeTables; Array32Of<BitmapSizeTable> sizeTables;
public: public:
DEFINE_SIZE_ARRAY (8, sizeTables); DEFINE_SIZE_ARRAY (8, sizeTables);
}; };

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

@ -3204,7 +3204,7 @@ struct FeatureVariations
protected: protected:
FixedVersion<> version; /* Version--0x00010000u */ FixedVersion<> version; /* Version--0x00010000u */
LArrayOf<FeatureVariationRecord> Array32Of<FeatureVariationRecord>
varRecords; varRecords;
public: public:
DEFINE_SIZE_ARRAY_SIZED (8, varRecords); DEFINE_SIZE_ARRAY_SIZED (8, varRecords);

2
src/hb-ot-meta-table.hh
View File

@ -113,7 +113,7 @@ struct meta
* Offset from the beginning of the table to the data. * Offset from the beginning of the table to the data.
* Per OT specification: * Per OT specification:
* Reserved. Not used; should be set to 0. */ * Reserved. Not used; should be set to 0. */
LArrayOf<DataMap> Array32Of<DataMap>
dataMaps;/* Array of data map records. */ dataMaps;/* Array of data map records. */
public: public:
DEFINE_SIZE_ARRAY (16, dataMaps); DEFINE_SIZE_ARRAY (16, dataMaps);