michael@0: # HG changeset patch michael@0: # Parent 9ded7a9f94a863dfa1f3227d3013367f51b8b522 michael@0: # User Nicholas Cameron michael@0: Bug 765038; fix a Clang compilation bug in Skia; r=jwatt michael@0: michael@0: diff --git a/gfx/skia/src/sfnt/SkOTTable_head.h b/gfx/skia/src/sfnt/SkOTTable_head.h michael@0: --- a/gfx/skia/src/sfnt/SkOTTable_head.h michael@0: +++ b/gfx/skia/src/sfnt/SkOTTable_head.h michael@0: @@ -109,18 +109,18 @@ struct SkOTTableHead { michael@0: } raw; michael@0: } macStyle; michael@0: SK_OT_USHORT lowestRecPPEM; michael@0: struct FontDirectionHint { michael@0: SK_TYPED_ENUM(Value, SK_OT_SHORT, michael@0: ((FullyMixedDirectionalGlyphs, SkTEndian_SwapBE16(0))) michael@0: ((OnlyStronglyLTR, SkTEndian_SwapBE16(1))) michael@0: ((StronglyLTR, SkTEndian_SwapBE16(2))) michael@0: - ((OnlyStronglyRTL, static_cast(SkTEndian_SwapBE16(-1)))) michael@0: - ((StronglyRTL, static_cast(SkTEndian_SwapBE16(-2)))) michael@0: + ((OnlyStronglyRTL, static_cast(SkTEndian_SwapBE16(static_cast(-1))))) michael@0: + ((StronglyRTL, static_cast(SkTEndian_SwapBE16(static_cast(-2))))) michael@0: SK_SEQ_END, michael@0: (value)SK_SEQ_END) michael@0: } fontDirectionHint; michael@0: struct IndexToLocFormat { michael@0: SK_TYPED_ENUM(Value, SK_OT_SHORT, michael@0: ((ShortOffsets, SkTEndian_SwapBE16(0))) michael@0: ((LongOffsets, SkTEndian_SwapBE16(1))) michael@0: SK_SEQ_END,