Author: malat
Date: 2012-07-26 15:39:42 +0000 (Thu, 26 Jul 2012)
New Revision: 11903
Added:
trunk/packages/insighttoolkit/branches/3.20.1/debian/patches/bug667417.patch
Modified:
trunk/packages/insighttoolkit/branches/3.20.1/debian/changelog
trunk/packages/insighttoolkit/branches/3.20.1/debian/patches/series
Log:
Prepare for upload
Modified: trunk/packages/insighttoolkit/branches/3.20.1/debian/changelog
===================================================================
--- trunk/packages/insighttoolkit/branches/3.20.1/debian/changelog
2012-07-26 14:26:49 UTC (rev 11902)
+++ trunk/packages/insighttoolkit/branches/3.20.1/debian/changelog
2012-07-26 15:39:42 UTC (rev 11903)
@@ -1,3 +1,10 @@
+insighttoolkit (3.20.1+git20120521-2) unstable; urgency=high
+
+ * Fix gcc 4.7.1 build failure of wrapitk-python. Closes: #667417
+ + debian/patches/bug667417.patch
+
+ -- Mathieu Malaterre <ma...@debian.org> Thu, 26 Jul 2012 17:38:47 +0200
+
insighttoolkit (3.20.1+git20120521-1) unstable; urgency=low
* New upstream. Includes many GCC 4.7 fixes. Closes: #673816, #673768.
Added:
trunk/packages/insighttoolkit/branches/3.20.1/debian/patches/bug667417.patch
===================================================================
---
trunk/packages/insighttoolkit/branches/3.20.1/debian/patches/bug667417.patch
(rev 0)
+++
trunk/packages/insighttoolkit/branches/3.20.1/debian/patches/bug667417.patch
2012-07-26 15:39:42 UTC (rev 11903)
@@ -0,0 +1,124 @@
+Description: adapt headers to gcc 4.7
+Author: Ilya Barygin <randomact...@ubuntu.com>
+
+---
insighttoolkit-3.20.1+git20120521.orig/Code/Review/Statistics/itkWeightedCentroidKdTreeGenerator.txx
++++
insighttoolkit-3.20.1+git20120521/Code/Review/Statistics/itkWeightedCentroidKdTreeGenerator.txx
+@@ -117,13 +117,13 @@ WeightedCentroidKdTreeGenerator< TSample
+ 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;
+
+
+---
insighttoolkit-3.20.1+git20120521.orig/Code/Review/Statistics/itkStatisticsAlgorithm.txx
++++
insighttoolkit-3.20.1+git20120521/Code/Review/Statistics/itkStatisticsAlgorithm.txx
+@@ -452,6 +452,49 @@ QuickSelect(TSubsample* sample,
+
+
+ template< class TSubsample >
++inline int UnguardedPartition(TSubsample* sample,
++ unsigned int activeDimension,
++ int beginIndex,
++ int endIndex,
++ typename TSubsample::MeasurementType pivotValue )
++{
++ typedef typename TSubsample::MeasurementType MeasurementType;
++ while( true )
++ {
++ MeasurementType beginValue =
++ sample->GetMeasurementVectorByIndex(beginIndex)[activeDimension];
++
++ while( beginValue < pivotValue )
++ {
++ ++beginIndex;
++
++ beginValue =
sample->GetMeasurementVectorByIndex(beginIndex)[activeDimension];
++ }
++
++ --endIndex;
++
++ MeasurementType endValue =
++ sample->GetMeasurementVectorByIndex(endIndex)[activeDimension];
++
++ while( pivotValue < endValue )
++ {
++ --endIndex;
++ endValue =
sample->GetMeasurementVectorByIndex(endIndex)[activeDimension];
++ }
++
++ if( !(beginIndex < endIndex) )
++ {
++ return beginIndex;
++ }
++
++ sample->Swap( beginIndex, endIndex );
++
++ ++beginIndex;
++ }
++}
++
++
++template< class TSubsample >
+ inline typename TSubsample::MeasurementType
+ NthElement(TSubsample* sample,
+ unsigned int activeDimension,
+@@ -497,49 +540,6 @@ NthElement(TSubsample* sample,
+ }
+
+
+-template< class TSubsample >
+-inline int UnguardedPartition(TSubsample* sample,
+- unsigned int activeDimension,
+- int beginIndex,
+- int endIndex,
+- typename TSubsample::MeasurementType pivotValue )
+-{
+- typedef typename TSubsample::MeasurementType MeasurementType;
+- while( true )
+- {
+- MeasurementType beginValue =
+- sample->GetMeasurementVectorByIndex(beginIndex)[activeDimension];
+-
+- while( beginValue < pivotValue )
+- {
+- ++beginIndex;
+-
+- beginValue =
sample->GetMeasurementVectorByIndex(beginIndex)[activeDimension];
+- }
+-
+- --endIndex;
+-
+- MeasurementType endValue =
+- sample->GetMeasurementVectorByIndex(endIndex)[activeDimension];
+-
+- while( pivotValue < endValue )
+- {
+- --endIndex;
+- endValue =
sample->GetMeasurementVectorByIndex(endIndex)[activeDimension];
+- }
+-
+- if( !(beginIndex < endIndex) )
+- {
+- return beginIndex;
+- }
+-
+- sample->Swap( beginIndex, endIndex );
+-
+- ++beginIndex;
+- }
+-}
+-
+-
+ template< class TSubsample >
+ inline void InsertSort(TSubsample* sample,
+ unsigned int activeDimension,
+
Modified: trunk/packages/insighttoolkit/branches/3.20.1/debian/patches/series
===================================================================
--- trunk/packages/insighttoolkit/branches/3.20.1/debian/patches/series
2012-07-26 14:26:49 UTC (rev 11902)
+++ trunk/packages/insighttoolkit/branches/3.20.1/debian/patches/series
2012-07-26 15:39:42 UTC (rev 11903)
@@ -12,3 +12,4 @@
png15support.patch
openjpegmath.patch
ITKNrrdIOmath.patch
+bug667417.patch
_______________________________________________
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
