blob: 427aa088241b58b4e7c48c4a694b25886360640f (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
|
diff -Naur ParaView-v4.2.0-source.orig/VTK/Rendering/FreeType/vtkFreeTypeTools.cxx ParaView-v4.2.0-source/VTK/Rendering/FreeType/vtkFreeTypeTools.cxx
--- ParaView-v4.2.0-source.orig/VTK/Rendering/FreeType/vtkFreeTypeTools.cxx 2015-06-29 23:15:33.391860680 +0200
+++ ParaView-v4.2.0-source/VTK/Rendering/FreeType/vtkFreeTypeTools.cxx 2015-06-29 23:43:34.336087557 +0200
@@ -1183,7 +1183,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;
@@ -1950,8 +1950,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], int(pen[0] + bitmapGlyph->left + bitmap->width));
+ bbox[2] = std::min(bbox[2], int(pen[1] + bitmapGlyph->top - 1 - bitmap->rows));
bbox[3] = std::max(bbox[3], pen[1] + bitmapGlyph->top - 1);
}
else
|