summaryrefslogtreecommitdiff
path: root/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-kern-table.hh
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-kern-table.hh')
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-kern-table.hh40
1 files changed, 20 insertions, 20 deletions
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-kern-table.hh b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-kern-table.hh
index e07faca63f3..368f547a693 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-kern-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-kern-table.hh
@@ -104,8 +104,8 @@ struct KernClassTable
}
protected:
- UINT16 firstGlyph; /* First glyph in class range. */
- ArrayOf<UINT16> classes; /* Glyph classes. */
+ HBUINT16 firstGlyph; /* First glyph in class range. */
+ ArrayOf<HBUINT16> classes; /* Glyph classes. */
public:
DEFINE_SIZE_ARRAY (4, classes);
};
@@ -115,7 +115,7 @@ struct KernSubTableFormat2
inline int get_kerning (hb_codepoint_t left, hb_codepoint_t right, const char *end) const
{
unsigned int l = (this+leftClassTable).get_class (left);
- unsigned int r = (this+leftClassTable).get_class (left);
+ unsigned int r = (this+rightClassTable).get_class (right);
unsigned int offset = l * rowWidth + r * sizeof (FWORD);
const FWORD *arr = &(this+array);
if (unlikely ((const void *) arr < (const void *) this || (const void *) arr >= (const void *) end))
@@ -136,7 +136,7 @@ struct KernSubTableFormat2
}
protected:
- UINT16 rowWidth; /* The width, in bytes, of a row in the table. */
+ HBUINT16 rowWidth; /* The width, in bytes, of a row in the table. */
OffsetTo<KernClassTable>
leftClassTable; /* Offset from beginning of this subtable to
* left-hand class table. */
@@ -275,19 +275,19 @@ struct KernOT : KernTable<KernOT>
};
protected:
- UINT16 versionZ; /* Unused. */
- UINT16 length; /* Length of the subtable (including this header). */
- UINT8 format; /* Subtable format. */
- UINT8 coverage; /* Coverage bits. */
+ HBUINT16 versionZ; /* Unused. */
+ HBUINT16 length; /* Length of the subtable (including this header). */
+ HBUINT8 format; /* Subtable format. */
+ HBUINT8 coverage; /* Coverage bits. */
KernSubTable subtable; /* Subtable data. */
public:
DEFINE_SIZE_MIN (6);
};
protected:
- UINT16 version; /* Version--0x0000u */
- UINT16 nTables; /* Number of subtables in the kerning table. */
- UINT8 data[VAR];
+ HBUINT16 version; /* Version--0x0000u */
+ HBUINT16 nTables; /* Number of subtables in the kerning table. */
+ HBUINT8 data[VAR];
public:
DEFINE_SIZE_ARRAY (4, data);
};
@@ -314,10 +314,10 @@ struct KernAAT : KernTable<KernAAT>
};
protected:
- UINT32 length; /* Length of the subtable (including this header). */
- UINT8 coverage; /* Coverage bits. */
- UINT8 format; /* Subtable format. */
- UINT16 tupleIndex; /* The tuple index (used for variations fonts).
+ HBUINT32 length; /* Length of the subtable (including this header). */
+ HBUINT8 coverage; /* Coverage bits. */
+ HBUINT8 format; /* Subtable format. */
+ HBUINT16 tupleIndex; /* The tuple index (used for variations fonts).
* This value specifies which tuple this subtable covers. */
KernSubTable subtable; /* Subtable data. */
public:
@@ -325,9 +325,9 @@ struct KernAAT : KernTable<KernAAT>
};
protected:
- UINT32 version; /* Version--0x00010000u */
- UINT32 nTables; /* Number of subtables in the kerning table. */
- UINT8 data[VAR];
+ HBUINT32 version; /* Version--0x00010000u */
+ HBUINT32 nTables; /* Number of subtables in the kerning table. */
+ HBUINT8 data[VAR];
public:
DEFINE_SIZE_ARRAY (8, data);
};
@@ -360,7 +360,7 @@ struct kern
{
inline void init (hb_face_t *face)
{
- blob = Sanitizer<kern>::sanitize (face->reference_table (HB_OT_TAG_kern));
+ blob = Sanitizer<kern>().sanitize (face->reference_table (HB_OT_TAG_kern));
table = Sanitizer<kern>::lock_instance (blob);
table_length = hb_blob_get_length (blob);
}
@@ -380,7 +380,7 @@ struct kern
protected:
union {
- UINT16 major;
+ HBUINT16 major;
KernOT ot;
KernAAT aat;
} u;