Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1167)

Unified Diff: src/sfnt/SkOTTable_OS_2_VA.h

Issue 189093020: Fix (1 << 31) to (1u << 31) in SkOTTable_OS_2. (Closed) Base URL: http://skia.googlecode.com/svn/trunk/
Patch Set: Pedantic Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/sfnt/SkOTTable_OS_2_V4.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/sfnt/SkOTTable_OS_2_VA.h
===================================================================
--- src/sfnt/SkOTTable_OS_2_VA.h (revision 13776)
+++ src/sfnt/SkOTTable_OS_2_VA.h (working copy)
@@ -76,10 +76,10 @@
Reserved07)
} field;
struct Raw {
- 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);
+ 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;
SK_OT_USHORT value;
} raw;
} fsType;
@@ -121,12 +121,12 @@
Reserved07)
} field;
struct Raw {
- 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);
+ 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;
SK_OT_USHORT value;
} raw;
} fsSelection;
« no previous file with comments | « src/sfnt/SkOTTable_OS_2_V4.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698