diff options
| author |  bungeman <bungeman@google.com> | 2016-08-16 12:27:49 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-08-16 12:27:49 -0700 |
| commit | 8fd23a86d0d16c93e4fa08f79cdcca4b48b6d7f9 (patch) | |
| tree | 57eb9e4b1f6c7e3485af398b9779fa5319ef663b /src/sfnt/SkOTTable_maxp_TT.h | |
| parent | 6c80a9d4b06e10a2865731c487a537d34963268a (diff) | |
Remove SkPreprocessorSeq.h and SkTypedEnum.h.
These were added to allow the use of typed enums before typed enums were
available on all platforms. Now that typed enums are available, just use
them directly.
Review-Url: https://codereview.chromium.org/2254513002
Diffstat (limited to 'src/sfnt/SkOTTable_maxp_TT.h')
| -rw-r--r-- | src/sfnt/SkOTTable_maxp_TT.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/sfnt/SkOTTable_maxp_TT.h b/src/sfnt/SkOTTable_maxp_TT.h index 1fdd0edc83..d45999723c 100644 --- a/src/sfnt/SkOTTable_maxp_TT.h +++ b/src/sfnt/SkOTTable_maxp_TT.h @@ -10,7 +10,6 @@ #include "SkEndian.h" #include "SkOTTableTypes.h" -#include "SkTypedEnum.h" #pragma pack(push, 1) @@ -24,11 +23,10 @@ struct SkOTTableMaximumProfile_TT { SK_OT_USHORT maxCompositePoints; SK_OT_USHORT maxCompositeContours; struct MaxZones { - SK_TYPED_ENUM(Value, SK_OT_USHORT, - ((DoesNotUseTwilightZone, SkTEndian_SwapBE16(1))) - ((UsesTwilightZone, SkTEndian_SwapBE16(2))) - SK_SEQ_END, - (value)SK_SEQ_END) + enum Value : SK_OT_USHORT { + DoesNotUseTwilightZone = SkTEndian_SwapBE16(1), + UsesTwilightZone = SkTEndian_SwapBE16(2), + } value; } maxZones; SK_OT_USHORT maxTwilightPoints; SK_OT_USHORT maxStorage; |