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_post.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_post.h')
| -rw-r--r-- | src/sfnt/SkOTTable_post.h | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/sfnt/SkOTTable_post.h b/src/sfnt/SkOTTable_post.h index 7461d5283e..1af692983f 100644 --- a/src/sfnt/SkOTTable_post.h +++ b/src/sfnt/SkOTTable_post.h @@ -10,7 +10,6 @@ #include "SkEndian.h" #include "SkOTTableTypes.h" -#include "SkTypedEnum.h" #pragma pack(push, 1) @@ -22,14 +21,13 @@ struct SkOTTablePostScript { static const SK_OT_ULONG TAG = SkOTTableTAG<SkOTTablePostScript>::value; struct Format { - SK_TYPED_ENUM(Value, SK_OT_Fixed, - ((version1, SkTEndian_SwapBE32(0x00010000))) - ((version2, SkTEndian_SwapBE32(0x00020000))) - ((version2_5, SkTEndian_SwapBE32(0x00025000))) - ((version3, SkTEndian_SwapBE32(0x00030000))) - ((version4, SkTEndian_SwapBE32(0x00040000))) - SK_SEQ_END, - SK_SEQ_END) + enum Value : SK_OT_Fixed { + version1 = SkTEndian_SwapBE32(0x00010000), + version2 = SkTEndian_SwapBE32(0x00020000), + version2_5 = SkTEndian_SwapBE32(0x00025000), + version3 = SkTEndian_SwapBE32(0x00030000), + version4 = SkTEndian_SwapBE32(0x00040000), + }; SK_OT_Fixed value; } format; SK_OT_Fixed italicAngle; |