gfx/skia/patches/archive/0014-Bug-765038-Fix-clang-build.patch@b8a032363ba2 (annotated)
gfx/skia/patches/archive/0014-Bug-765038-Fix-clang-build.patch
Thu, 22 Jan 2015 13:21:57 +0100
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Thu, 22 Jan 2015 13:21:57 +0100
- branch
- TOR_BUG_9701
- changeset 15
- b8a032363ba2
- permissions
- -rw-r--r--
Incorporate requested changes from Mozilla in review:
https://bugzilla.mozilla.org/show_bug.cgi?id=1123480#c6
| michael@0 | 1 | # HG changeset patch |
| michael@0 | 2 | # Parent 9ded7a9f94a863dfa1f3227d3013367f51b8b522 |
| michael@0 | 3 | # User Nicholas Cameron <ncameron@mozilla.com> |
| michael@0 | 4 | Bug 765038; fix a Clang compilation bug in Skia; r=jwatt |
| michael@0 | 5 | |
| michael@0 | 6 | diff --git a/gfx/skia/src/sfnt/SkOTTable_head.h b/gfx/skia/src/sfnt/SkOTTable_head.h |
| michael@0 | 7 | --- a/gfx/skia/src/sfnt/SkOTTable_head.h |
| michael@0 | 8 | +++ b/gfx/skia/src/sfnt/SkOTTable_head.h |
| michael@0 | 9 | @@ -109,18 +109,18 @@ struct SkOTTableHead { |
| michael@0 | 10 | } raw; |
| michael@0 | 11 | } macStyle; |
| michael@0 | 12 | SK_OT_USHORT lowestRecPPEM; |
| michael@0 | 13 | struct FontDirectionHint { |
| michael@0 | 14 | SK_TYPED_ENUM(Value, SK_OT_SHORT, |
| michael@0 | 15 | ((FullyMixedDirectionalGlyphs, SkTEndian_SwapBE16(0))) |
| michael@0 | 16 | ((OnlyStronglyLTR, SkTEndian_SwapBE16(1))) |
| michael@0 | 17 | ((StronglyLTR, SkTEndian_SwapBE16(2))) |
| michael@0 | 18 | - ((OnlyStronglyRTL, static_cast<SK_OT_SHORT>(SkTEndian_SwapBE16(-1)))) |
| michael@0 | 19 | - ((StronglyRTL, static_cast<SK_OT_SHORT>(SkTEndian_SwapBE16(-2)))) |
| michael@0 | 20 | + ((OnlyStronglyRTL, static_cast<SK_OT_SHORT>(SkTEndian_SwapBE16(static_cast<SK_OT_USHORT>(-1))))) |
| michael@0 | 21 | + ((StronglyRTL, static_cast<SK_OT_SHORT>(SkTEndian_SwapBE16(static_cast<SK_OT_USHORT>(-2))))) |
| michael@0 | 22 | SK_SEQ_END, |
| michael@0 | 23 | (value)SK_SEQ_END) |
| michael@0 | 24 | } fontDirectionHint; |
| michael@0 | 25 | struct IndexToLocFormat { |
| michael@0 | 26 | SK_TYPED_ENUM(Value, SK_OT_SHORT, |
| michael@0 | 27 | ((ShortOffsets, SkTEndian_SwapBE16(0))) |
| michael@0 | 28 | ((LongOffsets, SkTEndian_SwapBE16(1))) |
| michael@0 | 29 | SK_SEQ_END, |
