Use FWORD and UFWORD when it makes sense
I had forgotten about those types.
This commit is contained in:
parent
0c7fb7419c
commit
082b79fe9f
@ -90,10 +90,10 @@ struct glyfGlyphHeader
|
|||||||
* greater than or equal to zero,
|
* greater than or equal to zero,
|
||||||
* this is a simple glyph; if negative,
|
* this is a simple glyph; if negative,
|
||||||
* this is a composite glyph. */
|
* this is a composite glyph. */
|
||||||
SHORT xMin; /* Minimum x for coordinate data. */
|
FWORD xMin; /* Minimum x for coordinate data. */
|
||||||
SHORT yMin; /* Minimum y for coordinate data. */
|
FWORD yMin; /* Minimum y for coordinate data. */
|
||||||
SHORT xMax; /* Maximum x for coordinate data. */
|
FWORD xMax; /* Maximum x for coordinate data. */
|
||||||
SHORT yMax; /* Maximum y for coordinate data. */
|
FWORD yMax; /* Maximum y for coordinate data. */
|
||||||
|
|
||||||
DEFINE_SIZE_STATIC (10);
|
DEFINE_SIZE_STATIC (10);
|
||||||
};
|
};
|
||||||
|
@ -44,8 +44,8 @@ namespace OT {
|
|||||||
|
|
||||||
struct LongMetric
|
struct LongMetric
|
||||||
{
|
{
|
||||||
USHORT advance; /* Advance width/height. */
|
UFWORD advance; /* Advance width/height. */
|
||||||
SHORT lsb; /* Leading (left/top) side bearing. */
|
FWORD lsb; /* Leading (left/top) side bearing. */
|
||||||
public:
|
public:
|
||||||
DEFINE_SIZE_STATIC (4);
|
DEFINE_SIZE_STATIC (4);
|
||||||
};
|
};
|
||||||
@ -74,7 +74,7 @@ struct _mtx
|
|||||||
* be in the array, but that entry is
|
* be in the array, but that entry is
|
||||||
* required. The last entry applies to
|
* required. The last entry applies to
|
||||||
* all subsequent glyphs. */
|
* all subsequent glyphs. */
|
||||||
SHORT leadingBearingX[VAR]; /* Here the advance is assumed
|
FWORD leadingBearingX[VAR]; /* Here the advance is assumed
|
||||||
* to be the same as the advance
|
* to be the same as the advance
|
||||||
* for the last entry above. The
|
* for the last entry above. The
|
||||||
* number of entries in this array is
|
* number of entries in this array is
|
||||||
|
Loading…
Reference in New Issue
Block a user