[paraview] 01/03: Fix FTBFS against new freetype. (Closes: #783842)

[Anton Gladky]

This is an automated email from the git hooks/post-receive script.

gladk pushed a commit to branch master
in repository paraview.

commit 151d46f9db0ebc064858f602567d92fc4a809faa
Author: Anton Gladky <gladk at debian.org>
Date:   Tue May 5 19:12:01 2015 +0200

    Fix FTBFS against new freetype. (Closes: #783842)
---
 debian/patches/fix_ftbfs_freetype.patch | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/debian/patches/fix_ftbfs_freetype.patch b/debian/patches/fix_ftbfs_freetype.patch
new file mode 100644
index 0000000..e21e807
--- /dev/null
+++ b/debian/patches/fix_ftbfs_freetype.patch
@@ -0,0 +1,27 @@
+Description: Fix FTBFS against new freetype
+Author: Anton Gladky <gladk at debian.org>
+Bug-Debian: https://bugs.debian.org/783842
+Last-Update: 2015-05-05
+
+--- paraview-4.1.0+dfsg+1.orig/VTK/Rendering/FreeType/vtkFreeTypeTools.cxx
++++ paraview-4.1.0+dfsg+1/VTK/Rendering/FreeType/vtkFreeTypeTools.cxx
+@@ -1186,7 +1186,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;
+@@ -1951,8 +1951,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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/paraview.git