[kern] Move code

This commit is contained in:
Behdad Esfahbod 2018-11-07 12:57:10 -05:00
parent 1ff300464a
commit 30af5b4a4c
1 changed files with 69 additions and 63 deletions

View File

@ -235,13 +235,8 @@ struct KernTable
}
};
struct KernOT : KernTable<KernOT>
{
friend struct KernTable<KernOT>;
static const uint16_t minVersion = 0;
struct SubTableHeader
struct KernOTSubTableHeader
{
typedef AAT::ObsoleteTypes Types;
@ -273,6 +268,14 @@ struct KernOT : KernTable<KernOT>
DEFINE_SIZE_STATIC (6);
};
struct KernOT : KernTable<KernOT>
{
friend struct KernTable<KernOT>;
typedef KernOTSubTableHeader SubTableHeader;
static const uint16_t minVersion = 0;
protected:
HBUINT16 version; /* Version--0x0000u */
HBUINT16 tableCount; /* Number of subtables in the kerning table. */
@ -281,13 +284,8 @@ struct KernOT : KernTable<KernOT>
DEFINE_SIZE_MIN (4);
};
struct KernAAT : KernTable<KernAAT>
{
friend struct KernTable<KernAAT>;
static const uint32_t minVersion = 0x00010000u;
struct SubTableHeader
struct KernAATSubTableHeader
{
typedef AAT::ObsoleteTypes Types;
@ -318,6 +316,14 @@ struct KernAAT : KernTable<KernAAT>
DEFINE_SIZE_STATIC (8);
};
struct KernAAT : KernTable<KernAAT>
{
friend struct KernTable<KernAAT>;
typedef KernAATSubTableHeader SubTableHeader;
static const uint32_t minVersion = 0x00010000u;
protected:
HBUINT32 version; /* Version--0x00010000u */
HBUINT32 tableCount; /* Number of subtables in the kerning table. */