| Patrick Williams | ddad1a1 | 2017-02-23 20:36:32 -0600 | [diff] [blame] | 1 | From: Gert Wollny <gw.fossdev@gmail.com> |
| 2 | Date: Sun, 26 Jun 2016 13:25:00 +0200 |
| 3 | Description: gcc 6.0 build fixes |
| 4 | Bug: https://bugs.debian.org/811682 |
| 5 | |
| 6 | Slightly adapted to our environment |
| 7 | |
| 8 | Upstream-Status: Pending |
| 9 | |
| 10 | Signed-off-by: Andreas MΓΌller <schnitzeltony@googlemail.com> |
| 11 | --- a/src/engine/common/View.cc |
| 12 | +++ b/src/engine/common/View.cc |
| 13 | @@ -291,7 +291,7 @@ |
| 14 | } |
| 15 | } |
| 16 | |
| 17 | - return false; |
| 18 | + return SmartPtr<Element>(); |
| 19 | } |
| 20 | |
| 21 | bool |
| 22 | --- a/src/backend/common/tfm/TFM.hh |
| 23 | +++ b/src/backend/common/tfm/TFM.hh |
| 24 | @@ -37,7 +37,7 @@ |
| 25 | unsigned char face; |
| 26 | const char* codingScheme; |
| 27 | int designSize; |
| 28 | - int checksum; |
| 29 | + unsigned int checksum; |
| 30 | unsigned int nDimensions; |
| 31 | unsigned int nCharacters; |
| 32 | }; |
| 33 | @@ -52,7 +52,7 @@ |
| 34 | struct Kerning |
| 35 | { |
| 36 | UChar8 index; |
| 37 | - int value; |
| 38 | + unsigned int value; |
| 39 | }; |
| 40 | |
| 41 | struct Ligature |
| 42 | @@ -67,7 +67,7 @@ |
| 43 | UChar8 index; |
| 44 | int width; |
| 45 | int height; |
| 46 | - int depth; |
| 47 | + unsigned int depth; |
| 48 | int italicCorrection; |
| 49 | unsigned char nKernings; |
| 50 | const Kerning* kerning; |
| 51 | --- a/src/backend/common/StandardSymbolsShaper.hh |
| 52 | +++ b/src/backend/common/StandardSymbolsShaper.hh |
| 53 | @@ -32,20 +32,20 @@ |
| 54 | struct HStretchyChar |
| 55 | { |
| 56 | Char16 ch; |
| 57 | - Char8 normal; |
| 58 | - Char8 left; |
| 59 | - Char8 glue; |
| 60 | - Char8 right; |
| 61 | + UChar8 normal; |
| 62 | + UChar8 left; |
| 63 | + UChar8 glue; |
| 64 | + UChar8 right; |
| 65 | }; |
| 66 | |
| 67 | struct VStretchyChar |
| 68 | { |
| 69 | Char16 ch; |
| 70 | - Char8 normal; |
| 71 | - Char8 top; |
| 72 | - Char8 glue; |
| 73 | - Char8 middle; |
| 74 | - Char8 bottom; |
| 75 | + UChar8 normal; |
| 76 | + UChar8 top; |
| 77 | + UChar8 glue; |
| 78 | + UChar8 middle; |
| 79 | + UChar8 bottom; |
| 80 | }; |
| 81 | |
| 82 | protected: |
| 83 | --- a/src/backend/common/StandardSymbolsShaper.cc |
| 84 | +++ b/src/backend/common/StandardSymbolsShaper.cc |
| 85 | @@ -29,7 +29,7 @@ |
| 86 | #include "ShapingContext.hh" |
| 87 | |
| 88 | struct GlyphMap { |
| 89 | - Char8 index; |
| 90 | + UChar8 index; |
| 91 | Char16 ch; |
| 92 | }; |
| 93 | |