Author: smr Date: 2012-05-23 04:04:15 +0000 (Wed, 23 May 2012) New Revision: 10956
Removed: trunk/packages/insighttoolkit/branches/3.20.1/debian/patches/ftbfs-gcc-4.7.diff Modified: trunk/packages/insighttoolkit/branches/3.20.1/debian/changelog trunk/packages/insighttoolkit/branches/3.20.1/debian/patches/series Log: Pull new upstream sources from git. Modified: trunk/packages/insighttoolkit/branches/3.20.1/debian/changelog =================================================================== --- trunk/packages/insighttoolkit/branches/3.20.1/debian/changelog 2012-05-22 16:13:54 UTC (rev 10955) +++ trunk/packages/insighttoolkit/branches/3.20.1/debian/changelog 2012-05-23 04:04:15 UTC (rev 10956) @@ -1,3 +1,11 @@ +insighttoolkit (3.20.1+git20120521-1) unstable; urgency=low + + * New upstream. Includes many GCC 4.7 fixes. Closes: #673816, #673768. + + * patches/ftbfs-gcc-4.7.diff: remove. + + -- Steve M. Robbins <[email protected]> Tue, 22 May 2012 22:54:09 -0500 + insighttoolkit (3.20.1-8) unstable; urgency=low * Fix VolView compilation. Closes: #667411 Deleted: trunk/packages/insighttoolkit/branches/3.20.1/debian/patches/ftbfs-gcc-4.7.diff =================================================================== --- trunk/packages/insighttoolkit/branches/3.20.1/debian/patches/ftbfs-gcc-4.7.diff 2012-05-22 16:13:54 UTC (rev 10955) +++ trunk/packages/insighttoolkit/branches/3.20.1/debian/patches/ftbfs-gcc-4.7.diff 2012-05-23 04:04:15 UTC (rev 10956) @@ -1,53 +0,0 @@ -Index: insighttoolkit-3.20.1/Code/Numerics/Statistics/itkWeightedCentroidKdTreeGenerator.txx -=================================================================== ---- insighttoolkit-3.20.1.orig/Code/Numerics/Statistics/itkWeightedCentroidKdTreeGenerator.txx 2012-05-14 11:44:13.470123855 +0200 -+++ insighttoolkit-3.20.1/Code/Numerics/Statistics/itkWeightedCentroidKdTreeGenerator.txx 2012-05-14 11:44:29.846123261 +0200 -@@ -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 2012-05-14 11:44:13.498123854 +0200 -+++ insighttoolkit-3.20.1/Code/Review/Statistics/itkWeightedCentroidKdTreeGenerator.txx 2012-05-14 11:44:29.846123261 +0200 -@@ -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/Algorithms/itkGeodesicActiveContourLevelSetFunction.h -=================================================================== ---- insighttoolkit-3.20.1.orig/Code/Algorithms/itkGeodesicActiveContourLevelSetFunction.h 2012-05-14 11:44:37.334122991 +0200 -+++ insighttoolkit-3.20.1/Code/Algorithms/itkGeodesicActiveContourLevelSetFunction.h 2012-05-14 11:44:46.594122659 +0200 -@@ -114,7 +114,7 @@ - virtual ScalarValueType CurvatureSpeed(const NeighborhoodType & neighborhood, - const FloatOffsetType & offset, GlobalDataStruct *gd ) const - { -- return PropagationSpeed( neighborhood, offset, gd ); -+ return this->PropagationSpeed( neighborhood, offset, gd ); - } - - /** Set/Get the sigma for the Gaussian kernel used to compute the gradient Modified: trunk/packages/insighttoolkit/branches/3.20.1/debian/patches/series =================================================================== --- trunk/packages/insighttoolkit/branches/3.20.1/debian/patches/series 2012-05-22 16:13:54 UTC (rev 10955) +++ trunk/packages/insighttoolkit/branches/3.20.1/debian/patches/series 2012-05-23 04:04:15 UTC (rev 10956) @@ -10,6 +10,5 @@ itkvtkglue-vtk58.patch gzgetc.patch png15support.patch -ftbfs-gcc-4.7.diff openjpegmath.patch ITKNrrdIOmath.patch _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
