gtkmathview/trunk/gtkmathview-gcc6.patch

   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 --- a/src/engine/common/View.cc
   7 +++ b/src/engine/common/View.cc
   8 @@ -291,7 +291,7 @@
   9           }
  10      }
  11
  12 -  return false;
  13 +  return nullptr;
  14  }
  15
  16  bool
  17 --- a/src/backend/common/tfm/TFM.hh
  18 +++ b/src/backend/common/tfm/TFM.hh
  19 @@ -37,7 +37,7 @@
  20      unsigned char face;
  21      const char* codingScheme;
  22      int designSize;
  23 -    int checksum;
  24 +    unsigned int checksum;
  25      unsigned int nDimensions;
  26      unsigned int nCharacters;
  27    };
  28 @@ -52,7 +52,7 @@
  29    struct Kerning
  30    {
  31      UChar8 index;
  32 -    int value;
  33 +    unsigned int value;
  34    };
  35
  36    struct Ligature
  37 @@ -67,7 +67,7 @@
  38      UChar8 index;
  39      int width;
  40      int height;
  41 -    int depth;
  42 +    unsigned int depth;
  43      int italicCorrection;
  44      unsigned char nKernings;
  45      const Kerning* kerning;
  46 --- a/src/backend/common/ComputerModernShaper.cc
  47 +++ b/src/backend/common/ComputerModernShaper.cc
  48 @@ -578,7 +578,7 @@
  49    };
  50  #endif
  51
  52 -static ComputerModernShaper::PlainChar cmsMap[] =
  53 +static ComputerModernShaper::PlainChar32 cmsMap[] =
  54    {
  55      { 0x007B, 0x66 },  // LEFT CURLY BRACKET
  56      { 0x007D, 0x67 },  // RIGHT CURLY BRACKET
  57 --- a/src/backend/common/StandardSymbolsShaper.hh
  58 +++ b/src/backend/common/StandardSymbolsShaper.hh
  59 @@ -32,20 +32,20 @@
  60    struct HStretchyChar
  61    {
  62      Char16 ch;
  63 -    Char8 normal;
  64 -    Char8 left;
  65 -    Char8 glue;
  66 -    Char8 right;
  67 +    UChar8 normal;
  68 +    UChar8 left;
  69 +    UChar8 glue;
  70 +    UChar8 right;
  71    };
  72
  73    struct VStretchyChar
  74    {
  75      Char16 ch;
  76 -    Char8 normal;
  77 -    Char8 top;
  78 -    Char8 glue;
  79 -    Char8 middle;
  80 -    Char8 bottom;
  81 +    UChar8 normal;
  82 +    UChar8 top;
  83 +    UChar8 glue;
  84 +    UChar8 middle;
  85 +    UChar8 bottom;
  86    };
  87
  88  protected:
  89 --- a/src/backend/common/StandardSymbolsShaper.cc
  90 +++ b/src/backend/common/StandardSymbolsShaper.cc
  91 @@ -29,7 +29,7 @@
  92  #include "ShapingContext.hh"
  93
  94  struct GlyphMap {
  95 -  Char8 index;
  96 +  UChar8 index;
  97    Char16 ch;
  98  };
  99