[med-svn] r17519 - trunk/packages/insighttoolkit/trunk/debian/patches
Gert Wollny
gert-guest at moszumanska.debian.org
Thu Jul 24 15:20:19 UTC 2014
Author: gert-guest
Date: 2014-07-24 15:20:19 +0000 (Thu, 24 Jul 2014)
New Revision: 17519
Removed:
trunk/packages/insighttoolkit/trunk/debian/patches/0001_donot_include_emmintr_without_sse2_enabled.patch
trunk/packages/insighttoolkit/trunk/debian/patches/0002_OtsuMultipleThresholdsCalculator-accurray.patch
trunk/packages/insighttoolkit/trunk/debian/patches/0003_VoronoiSegmentationTestTolerance.patch
Log:
remove upstream applied patches
Deleted: trunk/packages/insighttoolkit/trunk/debian/patches/0001_donot_include_emmintr_without_sse2_enabled.patch
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/0001_donot_include_emmintr_without_sse2_enabled.patch 2014-07-24 15:19:16 UTC (rev 17518)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/0001_donot_include_emmintr_without_sse2_enabled.patch 2014-07-24 15:20:19 UTC (rev 17519)
@@ -1,21 +0,0 @@
-Description: Only include emmintrin.h if SSE2 is enabled. This should fix the problems
- with gccxml on i386
-Author: Gert Wollny <gw.fossdev at gmail.com>
-Bug: https://issues.itk.org/jira/browse/ITK-3299
-
-diff --git a/Modules/Core/Common/include/itkMathDetail.h b/Modules/Core/Common/include/itkMathDetail.h
-index 7db8727..5a7c456 100644
---- a/Modules/Core/Common/include/itkMathDetail.h
-+++ b/Modules/Core/Common/include/itkMathDetail.h
-@@ -39,9 +39,9 @@
- #include <fenv.h> // should this be cfenv?
- #endif /* ITK_HAVE_FENV_H */
-
--#ifdef ITK_HAVE_EMMINTRIN_H
-+#if defined(ITK_HAVE_EMMINTRIN_H) && defined(__SSE2__)
- #include <emmintrin.h> // sse 2 intrinsics
--#endif /* ITK_HAVE_EMMINTRIN_H */
-+#endif /* ITK_HAVE_EMMINTRIN_H && __SSE2__ */
-
- // assume no SSE2:
- #define USE_SSE2_64IMPL 0
Deleted: trunk/packages/insighttoolkit/trunk/debian/patches/0002_OtsuMultipleThresholdsCalculator-accurray.patch
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/0002_OtsuMultipleThresholdsCalculator-accurray.patch 2014-07-24 15:19:16 UTC (rev 17518)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/0002_OtsuMultipleThresholdsCalculator-accurray.patch 2014-07-24 15:20:19 UTC (rev 17519)
@@ -1,84 +0,0 @@
-Description: stabelize floating point operations in OtsuMultipleThresholdsCalculator
-Origin: upstream
-Applied-Upstream: Expected to land in v4.6
-diff --git a/Modules/Filtering/Thresholding/include/itkOtsuMultipleThresholdsCalculator.hxx b/Modules/Filtering/Thresholding/include/itkOtsuMultipleThresholdsCalculator.hxx
-index fbf7c33..6abf5d9 100644
---- a/Modules/Filtering/Thresholding/include/itkOtsuMultipleThresholdsCalculator.hxx
-+++ b/Modules/Filtering/Thresholding/include/itkOtsuMultipleThresholdsCalculator.hxx
-@@ -18,6 +18,7 @@
- #ifndef __itkOtsuMultipleThresholdsCalculator_hxx
- #define __itkOtsuMultipleThresholdsCalculator_hxx
-
-+#include "itkMath.h"
- #include "itkOtsuMultipleThresholdsCalculator.h"
-
- namespace itk
-@@ -53,11 +54,8 @@ OtsuMultipleThresholdsCalculator< TInputHistogram >
- {
- typename TInputHistogram::ConstPointer histogram = this->GetInputHistogram();
-
-- SizeValueType numberOfHistogramBins = histogram->Size();
-- SizeValueType numberOfClasses = classMean.size();
--
-- MeanType meanOld;
-- FrequencyType freqOld;
-+ const SizeValueType numberOfHistogramBins = histogram->Size();
-+ const SizeValueType numberOfClasses = classMean.size();
-
- unsigned int k;
- int j;
-@@ -73,8 +71,8 @@ OtsuMultipleThresholdsCalculator< TInputHistogram >
- // threshold
- ++thresholdIndexes[j];
-
-- meanOld = classMean[j];
-- freqOld = classFrequency[j];
-+ const MeanType meanOld = classMean[j];
-+ const FrequencyType freqOld = classFrequency[j];
-
- classFrequency[j] += histogram->GetFrequency(thresholdIndexes[j]);
-
-@@ -165,7 +163,7 @@ OtsuMultipleThresholdsCalculator< TInputHistogram >
- typename TInputHistogram::ConstIterator end = histogram->End();
-
- MeanType globalMean = NumericTraits< MeanType >::Zero;
-- FrequencyType globalFrequency = histogram->GetTotalFrequency();
-+ const FrequencyType globalFrequency = histogram->GetTotalFrequency();
- while ( iter != end )
- {
- globalMean += static_cast< MeanType >( iter.GetMeasurementVector()[0] )
-@@ -235,9 +233,10 @@ OtsuMultipleThresholdsCalculator< TInputHistogram >
- VarianceType maxVarBetween = NumericTraits< VarianceType >::Zero;
- for ( j = 0; j < numberOfClasses; j++ )
- {
-- maxVarBetween += (static_cast< VarianceType >( classFrequency[j] ) / static_cast< VarianceType >( globalFrequency ))
-+ maxVarBetween += (static_cast< VarianceType >( classFrequency[j] ))
- * static_cast< VarianceType >( ( classMean[j] ) * ( classMean[j] ) );
- }
-+ maxVarBetween /= static_cast< VarianceType >( globalFrequency );
-
- // Sum the relevant weights for valley emphasis
- WeightType valleyEmphasisFactor = NumericTraits< WeightType >::Zero;
-@@ -270,9 +269,10 @@ OtsuMultipleThresholdsCalculator< TInputHistogram >
- // Since we are looking for the argmax, the second term can be ignored because it is a constant, leading to the simpler
- // (\sum_{k=1}^{M} \omega_k \mu_k^2), which is what is implemented here.
- // Although this is no longer truly a "between class variance", we keep that name since it is only different by a constant.
-- varBetween += (static_cast< VarianceType >( classFrequency[j] ) / static_cast< VarianceType >( globalFrequency ))
-+ varBetween += (static_cast< VarianceType >( classFrequency[j] ))
- * static_cast< VarianceType >( ( classMean[j] ) * ( classMean[j] ) );
- }
-+ varBetween /= static_cast< VarianceType >( globalFrequency );
-
- if (m_ValleyEmphasis)
- {
-@@ -286,7 +286,9 @@ OtsuMultipleThresholdsCalculator< TInputHistogram >
- varBetween = varBetween * valleyEmphasisFactor;
- }
-
-- if ( varBetween > maxVarBetween )
-+ const unsigned int maxUlps = 1;
-+ if ( varBetween > maxVarBetween &&
-+ !Math::FloatAlmostEqual( maxVarBetween, varBetween, maxUlps) )
- {
- maxVarBetween = varBetween;
- maxVarThresholdIndexes = thresholdIndexes;
Deleted: trunk/packages/insighttoolkit/trunk/debian/patches/0003_VoronoiSegmentationTestTolerance.patch
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/0003_VoronoiSegmentationTestTolerance.patch 2014-07-24 15:19:16 UTC (rev 17518)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/0003_VoronoiSegmentationTestTolerance.patch 2014-07-24 15:20:19 UTC (rev 17519)
@@ -1,16 +0,0 @@
-Description: increase test tolerance in itkVoronoiPartitioningImageFilterTest1
-Origin: upstream
-Applied-Upstream: Expected to land in v4.6
-
-diff --git a/Modules/Segmentation/Voronoi/test/CMakeLists.txt b/Modules/Segmentation/Voronoi/test/CMakeLists.txt
-index 2555b59..5516319 100644
---- a/Modules/Segmentation/Voronoi/test/CMakeLists.txt
-+++ b/Modules/Segmentation/Voronoi/test/CMakeLists.txt
-@@ -16,6 +16,7 @@ itk_add_test(NAME itkVoronoiDiagram2DTest
- COMMAND ITKVoronoiTestDriver itkVoronoiDiagram2DTest ${ITK_TEST_OUTPUT_DIR}/VoronoiDiagram2DTest.vtk)
- itk_add_test(NAME itkVoronoiPartitioningImageFilterTest1
- COMMAND ITKVoronoiTestDriver
-+ --compareNumberOfPixelsTolerance 20
- --compare DATA{${ITK_DATA_ROOT}/Baseline/Algorithms/VoronoiPartioningImageFilterTest1.png,:}
- ${ITK_TEST_OUTPUT_DIR}/VoronoiPartioningImageFilterTest1.png
- itkVoronoiPartitioningImageFilterTest DATA{${ITK_DATA_ROOT}/Input/sf4.png} ${ITK_TEST_OUTPUT_DIR}/VoronoiPartioningImageFilterTest1.png 1)
More information about the debian-med-commit
mailing list