[med-svn] r21441 - in trunk/packages/insighttoolkit/trunk/debian: . patches

[Gert Wollny]

Author: gert-guest
Date: 2016-02-21 11:19:44 +0000 (Sun, 21 Feb 2016)
New Revision: 21441

Added:
   trunk/packages/insighttoolkit/trunk/debian/patches/ITKv3MultiResImageRegistrationTest_correct.patch
   trunk/packages/insighttoolkit/trunk/debian/patches/atomic_load.patch
   trunk/packages/insighttoolkit/trunk/debian/patches/flatStructuringElementTest_fix_rescale.patch
Modified:
   trunk/packages/insighttoolkit/trunk/debian/changelog
   trunk/packages/insighttoolkit/trunk/debian/patches/series
Log:
Update package to fix tests on i386

Modified: trunk/packages/insighttoolkit/trunk/debian/changelog
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/changelog	2016-02-21 09:12:51 UTC (rev 21440)
+++ trunk/packages/insighttoolkit/trunk/debian/changelog	2016-02-21 11:19:44 UTC (rev 21441)
@@ -1,3 +1,14 @@
+insighttoolkit4 (4.9.0-2) UNRELEASED; urgency=medium
+
+  * d/p: add patch atomic_load.patch to make atomic Load 
+    operation truely atomic
+  * d/p: add patch flatStructuringElementTest_fix_rescale.patch 
+    Closes: #814592 
+  * d/p: add patch ITKv3MultiResImageRegistrationTest_correct.patch
+    to stabelize this test 
+
+ -- Gert Wollny <gw.fossdev at gmail.com>  Sun, 21 Feb 2016 11:06:43 +0000
+
 insighttoolkit4 (4.9.0-1) unstable; urgency=medium
 
   * New upstream version  Closes:  #811809

Added: trunk/packages/insighttoolkit/trunk/debian/patches/ITKv3MultiResImageRegistrationTest_correct.patch
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/ITKv3MultiResImageRegistrationTest_correct.patch	                        (rev 0)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/ITKv3MultiResImageRegistrationTest_correct.patch	2016-02-21 11:19:44 UTC (rev 21441)
@@ -0,0 +1,29 @@
+Description: Improve accuracy of registration
+ reduce minimum step length and gradient tolerance in order to
+ stabelize the registration test run by using this program.
+Author: Gert Wollny <gw.fossdev at gmail.com>
+Forwarded: yes
+Last-Update: 2016-02-21
+
+Index: b/Examples/RegistrationITKv3/MultiResImageRegistration1.cxx
+===================================================================
+--- a/Examples/RegistrationITKv3/MultiResImageRegistration1.cxx	2016-01-29 22:39:15.000000000 +0100
++++ b/Examples/RegistrationITKv3/MultiResImageRegistration1.cxx	2016-02-20 22:59:57.994278400 +0100
+@@ -221,7 +221,7 @@
+     if ( registration->GetCurrentLevel() == 0 )
+       {
+       optimizer->SetMaximumStepLength( 16.00 );
+-      optimizer->SetMinimumStepLength( 0.01 );
++      optimizer->SetMinimumStepLength( 0.005 );
+       }
+     else
+       {
+@@ -489,7 +489,7 @@
+ 
+   optimizer->SetNumberOfIterations( 200 );
+   optimizer->SetRelaxationFactor( 0.9 );
+-
++  optimizer->SetGradientMagnitudeTolerance( 1e-6 );
+ 
+   // Create the Command observer and register it with the optimizer.
+   //

Added: trunk/packages/insighttoolkit/trunk/debian/patches/atomic_load.patch
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/atomic_load.patch	                        (rev 0)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/atomic_load.patch	2016-02-21 11:19:44 UTC (rev 21441)
@@ -0,0 +1,19 @@
+Description: Make the Load operation truly atomic
+Author: Gert Wollny <gw.fossdev at gmail.com>
+Forwarded: yes
+Last-Update: 2016-02-21
+
+Index: b/Modules/Core/Common/include/itkAtomicIntDetail.h
+===================================================================
+--- a/Modules/Core/Common/include/itkAtomicIntDetail.h	2016-01-29 22:39:15.000000000 +0100
++++ b/Modules/Core/Common/include/itkAtomicIntDetail.h	2016-02-18 13:26:51.509173243 +0100
+@@ -106,8 +106,7 @@
+ 
+   static ValueType Load(const ValueType *ref)
+   {
+-    __sync_synchronize();
+-    return *static_cast<const volatile ValueType *>(ref);
++    return __sync_add_and_fetch(const_cast<ValueType*>(ref), 0);
+   }
+ 
+   static void Store(ValueType *ref, ValueType val)

Added: trunk/packages/insighttoolkit/trunk/debian/patches/flatStructuringElementTest_fix_rescale.patch
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/flatStructuringElementTest_fix_rescale.patch	                        (rev 0)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/flatStructuringElementTest_fix_rescale.patch	2016-02-21 11:19:44 UTC (rev 21441)
@@ -0,0 +1,22 @@
+Description: Change the output range to stabelize test
+ The test uses an RescaleIntensity filter to binarize an
+ image, but this filter is numerically unstable for this
+ operation. 
+Author: Gert Wollny <gw.fossdev at gmail.com>
+Forwarded: yes
+Bug: https://bugs.debian.org/814591
+Last-Update: 2016-02-21
+
+Index: b/Modules/Filtering/MathematicalMorphology/test/itkFlatStructuringElementTest2.cxx
+===================================================================
+--- a/Modules/Filtering/MathematicalMorphology/test/itkFlatStructuringElementTest2.cxx	2016-01-29 22:39:15.000000000 +0100
++++ b/Modules/Filtering/MathematicalMorphology/test/itkFlatStructuringElementTest2.cxx	2016-02-20 22:41:27.477614428 +0100
+@@ -110,7 +110,7 @@
+   RescaleType::Pointer rescale = RescaleType::New();
+   rescale->SetInput( testImg );
+   rescale->SetOutputMinimum( itk::NumericTraits< bool >::ZeroValue()  );
+-  rescale->SetOutputMaximum( itk::NumericTraits< bool >::OneValue() );
++  rescale->SetOutputMaximum( itk::NumericTraits< bool >::OneValue() + 1 );
+ 
+   typedef itk::CastImageFilter<ImageUCType, ImageBoolType> castFilterType;
+   castFilterType::Pointer cast = castFilterType::New();

Modified: trunk/packages/insighttoolkit/trunk/debian/patches/series
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/series	2016-02-21 09:12:51 UTC (rev 21440)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/series	2016-02-21 11:19:44 UTC (rev 21441)
@@ -1,2 +1,5 @@
 nrrdio-linking.patch
 bsd-hdf5.patch
+atomic_load.patch
+flatStructuringElementTest_fix_rescale.patch
+ITKv3MultiResImageRegistrationTest_correct.patch