Fix a few struct size declarations

Was wrong.  As excercised by defining VAR to other than 1 in hb.hh.
This commit is contained in:
Behdad Esfahbod 2019-09-06 16:41:12 -04:00
parent 7d4da8b862
commit c379faed2b
4 changed files with 4 additions and 4 deletions

View File

@ -206,7 +206,7 @@ struct feat
SortedUnsizedArrayOf<FeatureName> SortedUnsizedArrayOf<FeatureName>
namesZ; /* The feature name array. */ namesZ; /* The feature name array. */
public: public:
DEFINE_SIZE_STATIC (24); DEFINE_SIZE_ARRAY (12, namesZ);
}; };
} /* namespace AAT */ } /* namespace AAT */

View File

@ -516,7 +516,7 @@ struct FDSelect0 {
HBUINT8 fds[VAR]; HBUINT8 fds[VAR];
DEFINE_SIZE_MIN (1); DEFINE_SIZE_MIN (0);
}; };
template <typename GID_TYPE, typename FD_TYPE> template <typename GID_TYPE, typename FD_TYPE>

View File

@ -125,7 +125,7 @@ struct SBIXStrike
imageOffsetsZ; /* Offset from the beginning of the strike data header imageOffsetsZ; /* Offset from the beginning of the strike data header
* to bitmap data for an individual glyph ID. */ * to bitmap data for an individual glyph ID. */
public: public:
DEFINE_SIZE_STATIC (8); DEFINE_SIZE_ARRAY (4, imageOffsetsZ);
}; };
struct sbix struct sbix

View File

@ -540,7 +540,7 @@ struct FeatureParams
FeatureParamsCharacterVariants characterVariants; FeatureParamsCharacterVariants characterVariants;
} u; } u;
public: public:
DEFINE_SIZE_STATIC (17); DEFINE_SIZE_MIN (0);
}; };
struct Feature struct Feature