- started update to 5.5.0

[packages/ParaView.git] / freetype.patch

diff --git a/freetype.patch b/freetype.patch
deleted file mode 100644 (file)
index 8ebb711..0000000
--- a/freetype.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- ParaView-v4.0.1-source/VTK/Rendering/FreeType/vtkFreeTypeTools.cxx.orig    2015-07-18 13:23:54.368978722 +0000
-+++ ParaView-v4.0.1-source/VTK/Rendering/FreeType/vtkFreeTypeTools.cxx 2015-07-18 13:23:47.992170735 +0000
-@@ -1165,7 +1165,7 @@
-     if (bitmap)
-       {
-       metaData.ascent = std::max(bitmapGlyph->top - 1, metaData.ascent);
--      metaData.descent = std::min(-(bitmap->rows - (bitmapGlyph->top - 1)),
-+      metaData.descent = std::min(-((int)bitmap->rows - (bitmapGlyph->top - 1)),
-                                   metaData.descent);
-       }
-     ++heightString;
-@@ -1930,8 +1930,8 @@
-     if (bitmap)
-       {
-       bbox[0] = std::min(bbox[0], pen[0] + bitmapGlyph->left);
--      bbox[1] = std::max(bbox[1], pen[0] + bitmapGlyph->left + bitmap->width);
--      bbox[2] = std::min(bbox[2], pen[1] + bitmapGlyph->top - 1 - bitmap->rows);
-+      bbox[1] = std::max(bbox[1], pen[0] + bitmapGlyph->left + (int)bitmap->width);
-+      bbox[2] = std::min(bbox[2], pen[1] + bitmapGlyph->top - 1 - (int)bitmap->rows);
-       bbox[3] = std::max(bbox[3], pen[1] + bitmapGlyph->top - 1);
-       }
-     else