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_OS_2_V1.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_OS_2_V1.h')
| -rw-r--r-- | src/sfnt/SkOTTable_OS_2_V1.h | 47 |
1 files changed, 22 insertions, 25 deletions
diff --git a/src/sfnt/SkOTTable_OS_2_V1.h b/src/sfnt/SkOTTable_OS_2_V1.h index 43e61d41cc..40cfdb64a0 100644 --- a/src/sfnt/SkOTTable_OS_2_V1.h +++ b/src/sfnt/SkOTTable_OS_2_V1.h @@ -12,7 +12,6 @@ #include "SkIBMFamilyClass.h" #include "SkOTTableTypes.h" #include "SkPanose.h" -#include "SkTypedEnum.h" #pragma pack(push, 1) @@ -22,33 +21,31 @@ struct SkOTTableOS2_V1 { SK_OT_SHORT xAvgCharWidth; struct WeightClass { - SK_TYPED_ENUM(Value, SK_OT_USHORT, - ((Thin, SkTEndian_SwapBE16(100))) - ((ExtraLight, SkTEndian_SwapBE16(200))) - ((Light, SkTEndian_SwapBE16(300))) - ((Normal, SkTEndian_SwapBE16(400))) - ((Medium, SkTEndian_SwapBE16(500))) - ((SemiBold, SkTEndian_SwapBE16(600))) - ((Bold, SkTEndian_SwapBE16(700))) - ((ExtraBold, SkTEndian_SwapBE16(800))) - ((Black, SkTEndian_SwapBE16(900))) - SK_SEQ_END, - SK_SEQ_END) + enum Value : SK_OT_USHORT { + Thin = SkTEndian_SwapBE16(100), + ExtraLight = SkTEndian_SwapBE16(200), + Light = SkTEndian_SwapBE16(300), + Normal = SkTEndian_SwapBE16(400), + Medium = SkTEndian_SwapBE16(500), + SemiBold = SkTEndian_SwapBE16(600), + Bold = SkTEndian_SwapBE16(700), + ExtraBold = SkTEndian_SwapBE16(800), + Black = SkTEndian_SwapBE16(900), + }; SK_OT_USHORT value; } usWeightClass; struct WidthClass { - SK_TYPED_ENUM(Value, SK_OT_USHORT, - ((UltraCondensed, SkTEndian_SwapBE16(1))) - ((ExtraCondensed, SkTEndian_SwapBE16(2))) - ((Condensed, SkTEndian_SwapBE16(3))) - ((SemiCondensed, SkTEndian_SwapBE16(4))) - ((Medium, SkTEndian_SwapBE16(5))) - ((SemiExpanded, SkTEndian_SwapBE16(6))) - ((Expanded, SkTEndian_SwapBE16(7))) - ((ExtraExpanded, SkTEndian_SwapBE16(8))) - ((UltraExpanded, SkTEndian_SwapBE16(9))) - SK_SEQ_END, - (value)SK_SEQ_END) + enum Value : SK_OT_USHORT { + UltraCondensed = SkTEndian_SwapBE16(1), + ExtraCondensed = SkTEndian_SwapBE16(2), + Condensed = SkTEndian_SwapBE16(3), + SemiCondensed = SkTEndian_SwapBE16(4), + Medium = SkTEndian_SwapBE16(5), + SemiExpanded = SkTEndian_SwapBE16(6), + Expanded = SkTEndian_SwapBE16(7), + ExtraExpanded = SkTEndian_SwapBE16(8), + UltraExpanded = SkTEndian_SwapBE16(9), + } value; } usWidthClass; union Type { struct Field { |