gfx/skia/patches/archive/0014-Bug-765038-Fix-clang-build.patch

changeset 0
6474c204b198
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/gfx/skia/patches/archive/0014-Bug-765038-Fix-clang-build.patch	Wed Dec 31 06:09:35 2014 +0100
     1.3 @@ -0,0 +1,29 @@
     1.4 +# HG changeset patch
     1.5 +# Parent 9ded7a9f94a863dfa1f3227d3013367f51b8b522
     1.6 +# User Nicholas Cameron <ncameron@mozilla.com>
     1.7 +Bug 765038; fix a Clang compilation bug in Skia; r=jwatt
     1.8 +
     1.9 +diff --git a/gfx/skia/src/sfnt/SkOTTable_head.h b/gfx/skia/src/sfnt/SkOTTable_head.h
    1.10 +--- a/gfx/skia/src/sfnt/SkOTTable_head.h
    1.11 ++++ b/gfx/skia/src/sfnt/SkOTTable_head.h
    1.12 +@@ -109,18 +109,18 @@ struct SkOTTableHead {
    1.13 +         } raw;
    1.14 +     } macStyle;
    1.15 +     SK_OT_USHORT lowestRecPPEM;
    1.16 +     struct FontDirectionHint {
    1.17 +         SK_TYPED_ENUM(Value, SK_OT_SHORT,
    1.18 +             ((FullyMixedDirectionalGlyphs, SkTEndian_SwapBE16(0)))
    1.19 +             ((OnlyStronglyLTR, SkTEndian_SwapBE16(1)))
    1.20 +             ((StronglyLTR, SkTEndian_SwapBE16(2)))
    1.21 +-            ((OnlyStronglyRTL, static_cast<SK_OT_SHORT>(SkTEndian_SwapBE16(-1))))
    1.22 +-            ((StronglyRTL, static_cast<SK_OT_SHORT>(SkTEndian_SwapBE16(-2))))
    1.23 ++            ((OnlyStronglyRTL, static_cast<SK_OT_SHORT>(SkTEndian_SwapBE16(static_cast<SK_OT_USHORT>(-1)))))
    1.24 ++            ((StronglyRTL, static_cast<SK_OT_SHORT>(SkTEndian_SwapBE16(static_cast<SK_OT_USHORT>(-2)))))
    1.25 +             SK_SEQ_END,
    1.26 +         (value)SK_SEQ_END)
    1.27 +     } fontDirectionHint;
    1.28 +     struct IndexToLocFormat {
    1.29 +         SK_TYPED_ENUM(Value, SK_OT_SHORT,
    1.30 +             ((ShortOffsets, SkTEndian_SwapBE16(0)))
    1.31 +             ((LongOffsets, SkTEndian_SwapBE16(1)))
    1.32 +             SK_SEQ_END,

mercurial