diff options
| author |  bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-03-12 03:46:48 +0000 |
|---|---|---|
| committer | bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-03-12 03:46:48 +0000 |
| commit | e60ae2eca3ca7142b6f1fc2361986756bcf79b81 (patch) | |
| tree | 2eab24ea9166e965c3ef05682449117dabab135b /src/sfnt/SkOTTable_OS_2_VA.h | |
| parent | 3258a5348beb721ee47fbe8928d78b0bf0fed5bd (diff) | |
Revert 13757.
git-svn-id: http://skia.googlecode.com/svn/trunk@13758 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/sfnt/SkOTTable_OS_2_VA.h')
| -rw-r--r-- | src/sfnt/SkOTTable_OS_2_VA.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/sfnt/SkOTTable_OS_2_VA.h b/src/sfnt/SkOTTable_OS_2_VA.h index bc45da2021..146e83b67e 100644 --- a/src/sfnt/SkOTTable_OS_2_VA.h +++ b/src/sfnt/SkOTTable_OS_2_VA.h @@ -76,10 +76,10 @@ struct SkOTTableOS2_VA { Reserved07) } field; struct Raw { - static const SK_OT_USHORT Installable = 0; - static const SK_OT_USHORT RestrictedMask = SkOTSetUSHORTBit<1>::value; - static const SK_OT_USHORT PreviewPrintMask = SkOTSetUSHORTBit<2>::value; - static const SK_OT_USHORT EditableMask = SkOTSetUSHORTBit<3>::value; + static const SK_OT_USHORT Installable = SkTEndian_SwapBE16(0); + static const SK_OT_USHORT RestrictedMask = SkTEndian_SwapBE16(1 << 1); + static const SK_OT_USHORT PreviewPrintMask = SkTEndian_SwapBE16(1 << 2); + static const SK_OT_USHORT EditableMask = SkTEndian_SwapBE16(1 << 3); SK_OT_USHORT value; } raw; } fsType; @@ -121,12 +121,12 @@ struct SkOTTableOS2_VA { Reserved07) } field; struct Raw { - static const SK_OT_USHORT ItalicMask = SkOTSetUSHORTBit<0>::value; - static const SK_OT_USHORT UnderscoreMask = SkOTSetUSHORTBit<1>::value; - static const SK_OT_USHORT NegativeMask = SkOTSetUSHORTBit<2>::value; - static const SK_OT_USHORT OutlinedMask = SkOTSetUSHORTBit<3>::value; - static const SK_OT_USHORT StrikeoutMask = SkOTSetUSHORTBit<4>::value; - static const SK_OT_USHORT BoldMask = SkOTSetUSHORTBit<5>::value; + static const SK_OT_USHORT ItalicMask = SkTEndian_SwapBE16(1 << 0); + static const SK_OT_USHORT UnderscoreMask = SkTEndian_SwapBE16(1 << 1); + static const SK_OT_USHORT NegativeMask = SkTEndian_SwapBE16(1 << 2); + static const SK_OT_USHORT OutlinedMask = SkTEndian_SwapBE16(1 << 3); + static const SK_OT_USHORT StrikeoutMask = SkTEndian_SwapBE16(1 << 4); + static const SK_OT_USHORT BoldMask = SkTEndian_SwapBE16(1 << 5); SK_OT_USHORT value; } raw; } fsSelection; |