tamiko 14/12/31 12:36:59 Added: paraview-4.2.0-vtk-freetype.patch Log: fix compilation with freetype-2.5.4, bug #533444 (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key BD3A97A3)
Revision Changes Path 1.1 sci-visualization/paraview/files/paraview-4.2.0-vtk-freetype.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/paraview/files/paraview-4.2.0-vtk-freetype.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/paraview/files/paraview-4.2.0-vtk-freetype.patch?rev=1.1&content-type=text/plain Index: paraview-4.2.0-vtk-freetype.patch =================================================================== --- a/ParaView-v4.2.0-source/VTK/Rendering/FreeType/vtkFreeTypeTools.cxx_orig 2014-12-23 09:25:35.000000000 +0100 +++ b/ParaView-v4.2.0-source/VTK/Rendering/FreeType/vtkFreeTypeTools.cxx 2014-12-24 09:40:31.886953389 +0100 @@ -1185,7 +1185,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(-(static_cast<int>(bitmap->rows) - (bitmapGlyph->top - 1)), metaData.descent); } ++heightString; @@ -1952,8 +1952,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 + 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
