25 lines
1.3 KiB
Diff
25 lines
1.3 KiB
Diff
|
Index: ParaView-v4.2.0-source/VTK/Rendering/FreeType/vtkFreeTypeTools.cxx
|
||
|
|
===================================================================
|
||
|
|
--- ParaView-v4.2.0-source.orig/VTK/Rendering/FreeType/vtkFreeTypeTools.cxx
|
||
|
|
+++ ParaView-v4.2.0-source/VTK/Rendering/FreeType/vtkFreeTypeTools.cxx
|
||
|
|
@@ -1183,7 +1183,7 @@ bool vtkFreeTypeTools::CalculateBounding
|
||
|
|
if (bitmap)
|
||
|
|
{
|
||
|
|
metaData.ascent = std::max(bitmapGlyph->top - 1, metaData.ascent);
|
||
|
|
- metaData.descent = std::min(-(bitmap->rows - (bitmapGlyph->top - 1)),
|
||
|
|
+ metaData.descent = std::min(-(static_cast<int>(bitmap->rows) - (bitmapGlyph->top - 1)),
|
||
|
|
metaData.descent);
|
||
|
|
}
|
||
|
|
++heightString;
|
||
|
|
@@ -1950,8 +1950,8 @@ void vtkFreeTypeTools::GetLineMetrics(T
|
||
|
|
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 + static_cast<int>(bitmap->width));
|
||
|
|
+ bbox[2] = std::min(bbox[2], pen[1] + bitmapGlyph->top - 1 - static_cast<int>(bitmap->rows));
|
||
|
|
bbox[3] = std::max(bbox[3], pen[1] + bitmapGlyph->top - 1);
|
||
|
|
}
|
||
|
|
else
|