[vtk6] 01/02: Fix FTBFS due to new freetype. (Closes: #779802)

[Anton Gladky]

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

gladk pushed a commit to branch master
in repository vtk6.

commit 0b9b3099c4bdde384ff64b751a58734f86c26e99
Author: James Cowgill <james410 at cowgill.org.uk>
Date:   Thu Mar 12 18:44:38 2015 +0100

    Fix FTBFS due to new freetype. (Closes: #779802)
---
 debian/patches/freetype-update.patch | 52 ++++++++++++++++++++++++++++++++++++
 debian/patches/series                |  1 +
 debian/tests/control                 |  1 -
 3 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/debian/patches/freetype-update.patch b/debian/patches/freetype-update.patch
new file mode 100644
index 0000000..7aa0b8a
--- /dev/null
+++ b/debian/patches/freetype-update.patch
@@ -0,0 +1,52 @@
+From 88f5a5bf546f7962089e107f7f1ae444c6d2797c Mon Sep 17 00:00:00 2001
+From: "Marcus D. Hanwell" <marcus.hanwell at kitware.com>
+Date: Thu, 8 Jan 2015 16:49:54 -0500
+Subject: [PATCH] Fix compile failures seen with latest FreeType
+
+Thanks to Oon-Ee Ng for reporting the issue on the VTK users list.
+This makes some minor changes to account for changes in return type
+in the FreeType API. VTK should now compile against the latest release.
+
+Change-Id: I5dcb608573f387a37ebbc2f9621e89c4551d98f2
+---
+ Rendering/FreeType/vtkFreeTypeTools.cxx | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/Rendering/FreeType/vtkFreeTypeTools.cxx b/Rendering/FreeType/vtkFreeTypeTools.cxx
+index fe0a1c2..84ff0f8 100644
+--- a/Rendering/FreeType/vtkFreeTypeTools.cxx
++++ b/Rendering/FreeType/vtkFreeTypeTools.cxx
+@@ -1198,7 +1198,7 @@ bool vtkFreeTypeTools::CalculateBoundingBox(const T& str,
+     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;
+@@ -1534,11 +1534,11 @@ bool vtkFreeTypeTools::RenderCharacter(CharType character, int &x, int &y,
+     unsigned char *glyphPtr;
+     float tpropAlpha = iMetaData->rgba[3] / 255.0;
+ 
+-    for (int j = 0; j < bitmap->rows; ++j)
++    for (int j = 0; j < static_cast<int>(bitmap->rows); ++j)
+       {
+       glyphPtr = glyphPtrRow;
+ 
+-      for (int i = 0; i < bitmap->width; ++i)
++      for (int i = 0; i < static_cast<int>(bitmap->width); ++i)
+         {
+         if (*glyphPtr == 0)
+           {
+@@ -2001,8 +2001,8 @@ void vtkFreeTypeTools::GetLineMetrics(T begin, T end, MetaData &metaData,
+     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
diff --git a/debian/patches/series b/debian/patches/series
index 5414c91..0939cc4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,3 +16,4 @@ use_system_sqlite.patch
 wxpython3.0.patch
 
 fix_GLintptr_FTBFS.patch
+freetype-update.patch
diff --git a/debian/tests/control b/debian/tests/control
index 2cb199a..d9e2354 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,3 +1,2 @@
 Tests: buildBoolean buildPoint buildVTU buildDistance buildPNG buildVTP
 Depends: libvtk6-dev, build-essential, cmake
-Restrictions: allow-stderr

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