s/LArrayOf/Array32Of/g
This commit is contained in:
parent
5efe360986
commit
2520a82df9
|
@ -54,7 +54,7 @@ struct Anchor
|
|||
DEFINE_SIZE_STATIC (4);
|
||||
};
|
||||
|
||||
typedef LArrayOf<Anchor> GlyphAnchors;
|
||||
typedef Array32Of<Anchor> GlyphAnchors;
|
||||
|
||||
struct ankr
|
||||
{
|
||||
|
|
|
@ -310,7 +310,7 @@ struct WidthDeltaPair
|
|||
DEFINE_SIZE_STATIC (24);
|
||||
};
|
||||
|
||||
typedef OT::LArrayOf<WidthDeltaPair> WidthDeltaCluster;
|
||||
typedef OT::Array32Of<WidthDeltaPair> WidthDeltaCluster;
|
||||
|
||||
struct JustificationCategory
|
||||
{
|
||||
|
|
|
@ -80,7 +80,7 @@ struct ltag
|
|||
protected:
|
||||
HBUINT32 version; /* Table version; currently 1 */
|
||||
HBUINT32 flags; /* Table flags; currently none defined */
|
||||
LArrayOf<FTStringRange>
|
||||
Array32Of<FTStringRange>
|
||||
tagRanges; /* Range for each tag's string */
|
||||
public:
|
||||
DEFINE_SIZE_ARRAY (12, tagRanges);
|
||||
|
|
|
@ -218,7 +218,7 @@ struct TTCHeaderVersion1
|
|||
Tag ttcTag; /* TrueType Collection ID string: 'ttcf' */
|
||||
FixedVersion<>version; /* Version of the TTC Header (1.0),
|
||||
* 0x00010000u */
|
||||
LArrayOf<Offset32To<OpenTypeOffsetTable>>
|
||||
Array32Of<Offset32To<OpenTypeOffsetTable>>
|
||||
table; /* Array of offsets to the OffsetTable for each font
|
||||
* from the beginning of the file */
|
||||
public:
|
||||
|
@ -295,7 +295,7 @@ struct ResourceRecord
|
|||
HBINT16 nameOffset; /* Offset from beginning of resource name list
|
||||
* to resource name, -1 means there is none. */
|
||||
HBUINT8 attrs; /* Resource attributes */
|
||||
NNOffset24To<LArrayOf<HBUINT8>>
|
||||
NNOffset24To<Array32Of<HBUINT8>>
|
||||
offset; /* Offset from beginning of data block to
|
||||
* data for this resource */
|
||||
HBUINT32 reserved; /* Reserved for handle to resource */
|
||||
|
|
|
@ -711,12 +711,12 @@ struct ArrayOf
|
|||
DEFINE_SIZE_ARRAY (sizeof (LenType), arrayZ);
|
||||
};
|
||||
template <typename Type>
|
||||
using LArrayOf = ArrayOf<Type, HBUINT32>;
|
||||
using Array32Of = ArrayOf<Type, HBUINT32>;
|
||||
using PString = ArrayOf<HBUINT8, HBUINT8>;
|
||||
|
||||
/* Array of Offset's */
|
||||
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>;
|
||||
|
||||
/* Array of offsets relative to the beginning of the array itself. */
|
||||
|
|
|
@ -697,7 +697,7 @@ struct BitmapSizeTable
|
|||
struct GlyphBitmapDataFormat17
|
||||
{
|
||||
SmallGlyphMetrics glyphMetrics;
|
||||
LArrayOf<HBUINT8> data;
|
||||
Array32Of<HBUINT8> data;
|
||||
public:
|
||||
DEFINE_SIZE_ARRAY (9, data);
|
||||
};
|
||||
|
@ -705,14 +705,14 @@ struct GlyphBitmapDataFormat17
|
|||
struct GlyphBitmapDataFormat18
|
||||
{
|
||||
BigGlyphMetrics glyphMetrics;
|
||||
LArrayOf<HBUINT8> data;
|
||||
Array32Of<HBUINT8> data;
|
||||
public:
|
||||
DEFINE_SIZE_ARRAY (12, data);
|
||||
};
|
||||
|
||||
struct GlyphBitmapDataFormat19
|
||||
{
|
||||
LArrayOf<HBUINT8> data;
|
||||
Array32Of<HBUINT8> data;
|
||||
public:
|
||||
DEFINE_SIZE_ARRAY (4, data);
|
||||
};
|
||||
|
@ -798,7 +798,7 @@ struct CBLC
|
|||
|
||||
protected:
|
||||
FixedVersion<> version;
|
||||
LArrayOf<BitmapSizeTable> sizeTables;
|
||||
Array32Of<BitmapSizeTable> sizeTables;
|
||||
public:
|
||||
DEFINE_SIZE_ARRAY (8, sizeTables);
|
||||
};
|
||||
|
|
|
@ -3204,7 +3204,7 @@ struct FeatureVariations
|
|||
|
||||
protected:
|
||||
FixedVersion<> version; /* Version--0x00010000u */
|
||||
LArrayOf<FeatureVariationRecord>
|
||||
Array32Of<FeatureVariationRecord>
|
||||
varRecords;
|
||||
public:
|
||||
DEFINE_SIZE_ARRAY_SIZED (8, varRecords);
|
||||
|
|
|
@ -113,7 +113,7 @@ struct meta
|
|||
* Offset from the beginning of the table to the data.
|
||||
* Per OT specification:
|
||||
* Reserved. Not used; should be set to 0. */
|
||||
LArrayOf<DataMap>
|
||||
Array32Of<DataMap>
|
||||
dataMaps;/* Array of data map records. */
|
||||
public:
|
||||
DEFINE_SIZE_ARRAY (16, dataMaps);
|
||||
|
|
Loading…
Reference in New Issue