| Index: src/sfnt/SkOTTable_hhea.h
|
| diff --git a/src/sfnt/SkOTTable_hhea.h b/src/sfnt/SkOTTable_hhea.h
|
| index a3b9cad7257b5faab8b710073bb01101d2615dec..76b15e276d02e4aa74b046bde5f2e8298314bcf6 100644
|
| --- a/src/sfnt/SkOTTable_hhea.h
|
| +++ b/src/sfnt/SkOTTable_hhea.h
|
| @@ -10,7 +10,6 @@
|
|
|
| #include "SkEndian.h"
|
| #include "SkOTTableTypes.h"
|
| -#include "SkTypedEnum.h"
|
|
|
| #pragma pack(push, 1)
|
|
|
| @@ -38,10 +37,9 @@ struct SkOTTableHorizontalHeader {
|
| SK_OT_SHORT Reserved28;
|
| SK_OT_SHORT Reserved30;
|
| struct MetricDataFormat {
|
| - SK_TYPED_ENUM(Value, SK_OT_SHORT,
|
| - ((CurrentFormat, SkTEndian_SwapBE16(0)))
|
| - SK_SEQ_END,
|
| - (value)SK_SEQ_END)
|
| + enum Value : SK_OT_SHORT {
|
| + CurrentFormat = SkTEndian_SwapBE16(0),
|
| + } value;
|
| } metricDataFormat;
|
| SK_OT_USHORT numberOfHMetrics;
|
| };
|
|
|