wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 765038; fix a Clang compilation bug in Skia; r=jwatt

Browse Source
This commit is contained in:
Nicholas Cameron 2012-06-15 11:52:15 +01:00
parent b3b4ce8dce
commit 4d1cdf1eb1
3 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
gfx/skia/patches/0014-Bug-765038-Fix-clang-build.patch Normal file
View File

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

1
gfx/skia/patches/README
View File

@ -16,3 +16,4 @@ See the relevant bugs in bugzilla for information on these patches:
0011-Bug-719575-Fix-clang-build.patch
0012-Bug-759683-make-ssse3-conditional.patch
0013-Bug-761890-fonts.patch
0014-Bug-765038-Fix-clang-build.patch

4
gfx/skia/src/sfnt/SkOTTable_head.h
View File

@ -114,8 +114,8 @@ struct SkOTTableHead {
((FullyMixedDirectionalGlyphs, SkTEndian_SwapBE16(0)))
((OnlyStronglyLTR, SkTEndian_SwapBE16(1)))
((StronglyLTR, SkTEndian_SwapBE16(2)))
((OnlyStronglyRTL, static_cast<SK_OT_SHORT>(SkTEndian_SwapBE16(-1))))
((StronglyRTL, static_cast<SK_OT_SHORT>(SkTEndian_SwapBE16(-2))))
((OnlyStronglyRTL, static_cast<SK_OT_SHORT>(SkTEndian_SwapBE16(static_cast<SK_OT_USHORT>(-1)))))
((StronglyRTL, static_cast<SK_OT_SHORT>(SkTEndian_SwapBE16(static_cast<SK_OT_USHORT>(-2)))))
SK_SEQ_END,
(value)SK_SEQ_END)
} fontDirectionHint;