| 1 |
tamiko 14/12/31 12:36:59 |
| 2 |
|
| 3 |
Added: paraview-4.2.0-vtk-freetype.patch |
| 4 |
Log: |
| 5 |
fix compilation with freetype-2.5.4, bug #533444 |
| 6 |
|
| 7 |
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key BD3A97A3) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 sci-visualization/paraview/files/paraview-4.2.0-vtk-freetype.patch |
| 11 |
|
| 12 |
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 |
| 13 |
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 |
| 14 |
|
| 15 |
Index: paraview-4.2.0-vtk-freetype.patch |
| 16 |
=================================================================== |
| 17 |
--- a/ParaView-v4.2.0-source/VTK/Rendering/FreeType/vtkFreeTypeTools.cxx_orig 2014-12-23 09:25:35.000000000 +0100 |
| 18 |
+++ b/ParaView-v4.2.0-source/VTK/Rendering/FreeType/vtkFreeTypeTools.cxx 2014-12-24 09:40:31.886953389 +0100 |
| 19 |
@@ -1185,7 +1185,7 @@ |
| 20 |
if (bitmap) |
| 21 |
{ |
| 22 |
metaData.ascent = std::max(bitmapGlyph->top - 1, metaData.ascent); |
| 23 |
- metaData.descent = std::min(-(bitmap->rows - (bitmapGlyph->top - 1)), |
| 24 |
+ metaData.descent = std::min(-(static_cast<int>(bitmap->rows) - (bitmapGlyph->top - 1)), |
| 25 |
metaData.descent); |
| 26 |
} |
| 27 |
++heightString; |
| 28 |
@@ -1952,8 +1952,8 @@ |
| 29 |
if (bitmap) |
| 30 |
{ |
| 31 |
bbox[0] = std::min(bbox[0], pen[0] + bitmapGlyph->left); |
| 32 |
- bbox[1] = std::max(bbox[1], pen[0] + bitmapGlyph->left + bitmap->width); |
| 33 |
- bbox[2] = std::min(bbox[2], pen[1] + bitmapGlyph->top - 1 - bitmap->rows); |
| 34 |
+ bbox[1] = std::max(bbox[1], pen[0] + bitmapGlyph->left + static_cast<int>(bitmap->width)); |
| 35 |
+ bbox[2] = std::min(bbox[2], pen[1] + bitmapGlyph->top - 1 - static_cast<int>(bitmap->rows)); |
| 36 |
bbox[3] = std::max(bbox[3], pen[1] + bitmapGlyph->top - 1); |
| 37 |
} |
| 38 |
else |
Archives