0014-Bug-765038-Fix-clang-build.patch (1366B)
1 # HG changeset patch 2 # Parent 9ded7a9f94a863dfa1f3227d3013367f51b8b522 3 # User Nicholas Cameron <ncameron@mozilla.com> 4 Bug 765038; fix a Clang compilation bug in Skia; r=jwatt 5 6 diff --git a/gfx/skia/src/sfnt/SkOTTable_head.h b/gfx/skia/src/sfnt/SkOTTable_head.h 7 --- a/gfx/skia/src/sfnt/SkOTTable_head.h 8 +++ b/gfx/skia/src/sfnt/SkOTTable_head.h 9 @@ -109,18 +109,18 @@ struct SkOTTableHead { 10 } raw; 11 } macStyle; 12 SK_OT_USHORT lowestRecPPEM; 13 struct FontDirectionHint { 14 SK_TYPED_ENUM(Value, SK_OT_SHORT, 15 ((FullyMixedDirectionalGlyphs, SkTEndian_SwapBE16(0))) 16 ((OnlyStronglyLTR, SkTEndian_SwapBE16(1))) 17 ((StronglyLTR, SkTEndian_SwapBE16(2))) 18 - ((OnlyStronglyRTL, static_cast<SK_OT_SHORT>(SkTEndian_SwapBE16(-1)))) 19 - ((StronglyRTL, static_cast<SK_OT_SHORT>(SkTEndian_SwapBE16(-2)))) 20 + ((OnlyStronglyRTL, static_cast<SK_OT_SHORT>(SkTEndian_SwapBE16(static_cast<SK_OT_USHORT>(-1))))) 21 + ((StronglyRTL, static_cast<SK_OT_SHORT>(SkTEndian_SwapBE16(static_cast<SK_OT_USHORT>(-2))))) 22 SK_SEQ_END, 23 (value)SK_SEQ_END) 24 } fontDirectionHint; 25 struct IndexToLocFormat { 26 SK_TYPED_ENUM(Value, SK_OT_SHORT, 27 ((ShortOffsets, SkTEndian_SwapBE16(0))) 28 ((LongOffsets, SkTEndian_SwapBE16(1))) 29 SK_SEQ_END,