[Debian-med-packaging] Bug#671438: insighttoolkit headers cause build failures with GCC 4.7

[Matthias Klose]

Package: insighttoolkit
Version: 3.20.1-5
Severity: serious
Tags: sid wheezy patch
User: debian-gcc at lists.debian.org
Usertags: ftbfs-gcc-4.7

-------------- next part --------------
diff -Nru insighttoolkit-3.20.1/debian/changelog insighttoolkit-3.20.1/debian/changelog
--- insighttoolkit-3.20.1/debian/changelog	2012-03-15 02:25:01.000000000 +0000
+++ insighttoolkit-3.20.1/debian/changelog	2012-05-03 20:49:45.000000000 +0000
@@ -1,3 +1,10 @@
+insighttoolkit (3.20.1-5.1) unstable; urgency=low
+
+  * Non maintainer upload.
+  * Fix build failure with GCC 4.7.
+
+ -- Matthias Klose <doko at debian.org>  Thu, 03 May 2012 22:49:16 +0200
+
 insighttoolkit (3.20.1-5) unstable; urgency=low
 
   * patches/gzgetc.patch: New.  Former function ::gzgetc() is now a macro,
diff -Nru insighttoolkit-3.20.1/debian/patches/ftbfs-gcc-4.7.diff insighttoolkit-3.20.1/debian/patches/ftbfs-gcc-4.7.diff
--- insighttoolkit-3.20.1/debian/patches/ftbfs-gcc-4.7.diff	1970-01-01 00:00:00.000000000 +0000
+++ insighttoolkit-3.20.1/debian/patches/ftbfs-gcc-4.7.diff	2012-05-03 20:26:11.000000000 +0000
@@ -0,0 +1,40 @@
+Index: insighttoolkit-3.20.1/Code/Numerics/Statistics/itkWeightedCentroidKdTreeGenerator.txx
+===================================================================
+--- insighttoolkit-3.20.1.orig/Code/Numerics/Statistics/itkWeightedCentroidKdTreeGenerator.txx	2011-10-25 16:37:23.000000000 +0000
++++ insighttoolkit-3.20.1/Code/Numerics/Statistics/itkWeightedCentroidKdTreeGenerator.txx	2012-05-03 20:26:07.942400611 +0000
+@@ -117,13 +117,13 @@
+   upperBound[partitionDimension] = partitionValue;
+   const unsigned int beginLeftIndex = beginIndex;
+   const unsigned int endLeftIndex   = medianIndex;
+-  KdTreeNodeType* left = GenerateTreeLoop(beginLeftIndex, endLeftIndex, lowerBound, upperBound, level + 1);
++  KdTreeNodeType* left = this->GenerateTreeLoop(beginLeftIndex, endLeftIndex, lowerBound, upperBound, level + 1);
+   upperBound[partitionDimension] = dimensionUpperBound;
+ 
+   lowerBound[partitionDimension] = partitionValue;
+   const unsigned int beginRightIndex = medianIndex+1;
+   const unsigned int endRighIndex    = endIndex;
+-  KdTreeNodeType* right = GenerateTreeLoop(beginRightIndex, endRighIndex, lowerBound, upperBound, level + 1);
++  KdTreeNodeType* right = this->GenerateTreeLoop(beginRightIndex, endRighIndex, lowerBound, upperBound, level + 1);
+   lowerBound[partitionDimension] = dimensionLowerBound;
+ 
+ 
+Index: insighttoolkit-3.20.1/Code/Review/Statistics/itkWeightedCentroidKdTreeGenerator.txx
+===================================================================
+--- insighttoolkit-3.20.1.orig/Code/Review/Statistics/itkWeightedCentroidKdTreeGenerator.txx	2011-10-25 16:37:23.000000000 +0000
++++ insighttoolkit-3.20.1/Code/Review/Statistics/itkWeightedCentroidKdTreeGenerator.txx	2012-05-03 20:25:56.758400196 +0000
+@@ -117,13 +117,13 @@
+   upperBound[partitionDimension] = partitionValue;
+   const unsigned int beginLeftIndex = beginIndex;
+   const unsigned int endLeftIndex   = medianIndex;
+-  KdTreeNodeType* left = GenerateTreeLoop(beginLeftIndex, endLeftIndex, lowerBound, upperBound, level + 1);
++  KdTreeNodeType* left = this->GenerateTreeLoop(beginLeftIndex, endLeftIndex, lowerBound, upperBound, level + 1);
+   upperBound[partitionDimension] = dimensionUpperBound;
+ 
+   lowerBound[partitionDimension] = partitionValue;
+   const unsigned int beginRightIndex = medianIndex+1;
+   const unsigned int endRighIndex    = endIndex;
+-  KdTreeNodeType* right = GenerateTreeLoop(beginRightIndex, endRighIndex, lowerBound, upperBound, level + 1);
++  KdTreeNodeType* right = this->GenerateTreeLoop(beginRightIndex, endRighIndex, lowerBound, upperBound, level + 1);
+   lowerBound[partitionDimension] = dimensionLowerBound;
+ 
+ 
diff -Nru insighttoolkit-3.20.1/debian/patches/series insighttoolkit-3.20.1/debian/patches/series
--- insighttoolkit-3.20.1/debian/patches/series	2012-03-15 02:22:33.000000000 +0000
+++ insighttoolkit-3.20.1/debian/patches/series	2012-05-03 20:24:28.000000000 +0000
@@ -9,3 +9,4 @@
 wrap-iifilter-split.patch
 itkvtkglue-vtk58.patch
 gzgetc.patch
+ftbfs-gcc-4.7.diff