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

[Gert Wollny]

Author: gewo
Date: 2017-06-24 15:13:08 +0000 (Sat, 24 Jun 2017)
New Revision: 23850

Modified:
   trunk/packages/insighttoolkit/trunk/debian/patches/itk4.12.0-resource_cprobe.patch
   trunk/packages/insighttoolkit/trunk/debian/rules
Log:
Update patch and i386 build flags

Modified: trunk/packages/insighttoolkit/trunk/debian/patches/itk4.12.0-resource_cprobe.patch
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/itk4.12.0-resource_cprobe.patch	2017-06-24 14:35:59 UTC (rev 23849)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/itk4.12.0-resource_cprobe.patch	2017-06-24 15:13:08 UTC (rev 23850)
@@ -1,3 +1,8 @@
+Description: Inline call to UpdateMinimumMaximumMeasuredValue
+ For some reason on i386 UpdateMinimumMaximumMeasuredValue is not
+ properly instanciated, resulting in a linker error. Work around
+ this by inlining the call.
+Author: Gert Wollny <gewo at debian.org>
 --- a/Modules/Core/Common/include/itkResourceProbe.hxx
 +++ b/Modules/Core/Common/include/itkResourceProbe.hxx
 @@ -110,6 +110,22 @@
@@ -23,7 +28,25 @@
  ::Stop(void)
  {
    ValueType probevalue = this->GetInstantValue() - this->m_StartValue;
-@@ -400,23 +416,6 @@
+@@ -118,7 +134,16 @@
+     return;
+     }
+ 
+-  this->UpdateMinimumMaximumMeasuredValue(probevalue);
++  if(this->m_MinimumValue > probevalue)
++    {
++    this->m_MinimumValue = probevalue;
++    }
++
++  if(this->m_MaximumValue < probevalue)
++    {
++    this->m_MaximumValue = probevalue;
++    }
++
+   this->m_TotalValue += probevalue;
+   this->m_ProbeValueList.push_back(probevalue);
+   this->m_NumberOfStops++;
+@@ -400,23 +425,6 @@
  }
  
  

Modified: trunk/packages/insighttoolkit/trunk/debian/rules
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/rules	2017-06-24 14:35:59 UTC (rev 23849)
+++ trunk/packages/insighttoolkit/trunk/debian/rules	2017-06-24 15:13:08 UTC (rev 23850)
@@ -16,7 +16,7 @@
 #(unsigned long) == (unsigned int) on 32 bit, since itk 4.10 or g++-5.4   
   ENABLE_UNSIGNED_LONG=OFF 
   # Tests are permanently failing without sse enabled 
-  export DEB_CXXFLAGS_MAINT_APPEND=-msse2
+  export DEB_CXXFLAGS_MAINT_APPEND=-msse2 -mfpmath=sse
 else
   ENABLE_FFTW=ON
   ENABLE_UNSIGNED_LONG=ON