freetype.patch

   1 --- ParaView-v4.0.1-source/VTK/Rendering/FreeType/vtkFreeTypeTools.cxx.orig     2015-07-18 13:23:54.368978722 +0000
   2 +++ ParaView-v4.0.1-source/VTK/Rendering/FreeType/vtkFreeTypeTools.cxx  2015-07-18 13:23:47.992170735 +0000
   3 @@ -1165,7 +1165,7 @@
   4      if (bitmap)
   5        {
   6        metaData.ascent = std::max(bitmapGlyph->top - 1, metaData.ascent);
   7 -      metaData.descent = std::min(-(bitmap->rows - (bitmapGlyph->top - 1)),
   8 +      metaData.descent = std::min(-((int)bitmap->rows - (bitmapGlyph->top - 1)),
   9                                    metaData.descent);
  10        }
  11      ++heightString;
  12 @@ -1930,8 +1930,8 @@
  13      if (bitmap)
  14        {
  15        bbox[0] = std::min(bbox[0], pen[0] + bitmapGlyph->left);
  16 -      bbox[1] = std::max(bbox[1], pen[0] + bitmapGlyph->left + bitmap->width);
  17 -      bbox[2] = std::min(bbox[2], pen[1] + bitmapGlyph->top - 1 - bitmap->rows);
  18 +      bbox[1] = std::max(bbox[1], pen[0] + bitmapGlyph->left + (int)bitmap->width);
  19 +      bbox[2] = std::min(bbox[2], pen[1] + bitmapGlyph->top - 1 - (int)bitmap->rows);
  20        bbox[3] = std::max(bbox[3], pen[1] + bitmapGlyph->top - 1);
  21        }
  22      else