[med-svn] r11928 - in trunk/packages/insighttoolkit/branches/3.20.1/debian: . patches

[Mathieu Malaterre]

Author: malat
Date: 2012-07-28 15:11:28 +0000 (Sat, 28 Jul 2012)
New Revision: 11928

Added:
   trunk/packages/insighttoolkit/branches/3.20.1/debian/patches/nan-i386.patch
Modified:
   trunk/packages/insighttoolkit/branches/3.20.1/debian/changelog
   trunk/packages/insighttoolkit/branches/3.20.1/debian/patches/series
Log:
Need to patch itk to get plastimatch test suite to pass on gcc 4.7.0

Modified: trunk/packages/insighttoolkit/branches/3.20.1/debian/changelog
===================================================================
--- trunk/packages/insighttoolkit/branches/3.20.1/debian/changelog	2012-07-28 13:39:53 UTC (rev 11927)
+++ trunk/packages/insighttoolkit/branches/3.20.1/debian/changelog	2012-07-28 15:11:28 UTC (rev 11928)
@@ -1,3 +1,10 @@
+insighttoolkit (3.20.1+git20120521-3) unstable; urgency=low
+
+  * Fix a sanity check yielding false negatives. Closes: #682805
+    + debian/patches/nan-i386.patch
+
+ -- Mathieu Malaterre <malat at debian.org>  Sat, 28 Jul 2012 17:10:41 +0200
+
 insighttoolkit (3.20.1+git20120521-2) unstable; urgency=low
 
   * Fix gcc 4.7.1 build failure of wrapitk-python. Closes: #667417

Added: trunk/packages/insighttoolkit/branches/3.20.1/debian/patches/nan-i386.patch
===================================================================
--- trunk/packages/insighttoolkit/branches/3.20.1/debian/patches/nan-i386.patch	                        (rev 0)
+++ trunk/packages/insighttoolkit/branches/3.20.1/debian/patches/nan-i386.patch	2012-07-28 15:11:28 UTC (rev 11928)
@@ -0,0 +1,26 @@
+Description: Fix test failures due to NrrdIO on i386
+ Fix a bunch of failing tests, all because NrrdIO was doing some run
+ time checks on NaN. The run-time check is already skipped on Apple
+ builds  and with Visual Studio. So now we add GCC version >= 4.7.
+Author: Paul Novotny <paul at paulnovo.us>
+Applied-Upstream: http://itk.org/gitweb?p=ITK.git;a=commit;h=21da36bc995
+
+Index: insighttoolkit-3.20.1+git20120521/Utilities/NrrdIO/sane.c
+===================================================================
+--- insighttoolkit-3.20.1+git20120521.orig/Utilities/NrrdIO/sane.c	2012-05-03 18:11:41.000000000 +0200
++++ insighttoolkit-3.20.1+git20120521/Utilities/NrrdIO/sane.c	2012-07-28 17:04:31.319720796 +0200
+@@ -107,9 +107,12 @@
+ 
+  1) APPLE builds due to a cross-compilation problem, and
+  2) Visual Studio builds for version newer than 2005 (not included)
+- when building in 32bits. */
++ when building in 32bits.
++ 3) GCC 4.7 Builds when building in 32bits */
+ 
+-#if defined(__APPLE__) || ( defined(_MSC_VER) && _MSC_VER >= 1400 ) 
++
++#if defined(__APPLE__) || ( defined(_MSC_VER) && _MSC_VER >= 1400 ) || \
++ ( defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__  >= 7 )))
+          /* don't compare airFP_SNAN */
+ #else
+          && airFP_SNAN == airFPClass_f(AIR_SNAN) 

Modified: trunk/packages/insighttoolkit/branches/3.20.1/debian/patches/series
===================================================================
--- trunk/packages/insighttoolkit/branches/3.20.1/debian/patches/series	2012-07-28 13:39:53 UTC (rev 11927)
+++ trunk/packages/insighttoolkit/branches/3.20.1/debian/patches/series	2012-07-28 15:11:28 UTC (rev 11928)
@@ -13,3 +13,4 @@
 openjpegmath.patch
 ITKNrrdIOmath.patch
 bug667417.patch
+nan-i386.patch