[med-svn] r6590 - trunk/packages/vxl/trunk/debian/patches

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-04-19 10:58:40 +0000 (Tue, 19 Apr 2011)
New Revision: 6590

Modified:
   trunk/packages/vxl/trunk/debian/patches/sse2.patch
Log:
Fix comp error on non-intel based arch

Modified: trunk/packages/vxl/trunk/debian/patches/sse2.patch
===================================================================
--- trunk/packages/vxl/trunk/debian/patches/sse2.patch	2011-04-19 07:59:08 UTC (rev 6589)
+++ trunk/packages/vxl/trunk/debian/patches/sse2.patch	2011-04-19 10:58:40 UTC (rev 6590)
@@ -9,8 +9,8 @@
 
 Index: vxl-1.14.0/core/vnl/vnl_math.h
 ===================================================================
---- vxl-1.14.0.orig/core/vnl/vnl_math.h	2011-04-18 21:42:26.000000000 +0200
-+++ vxl-1.14.0/core/vnl/vnl_math.h	2011-04-18 21:42:37.000000000 +0200
+--- vxl-1.14.0.orig/core/vnl/vnl_math.h	2009-11-21 16:45:28.000000000 +0100
++++ vxl-1.14.0/core/vnl/vnl_math.h	2011-04-19 12:55:21.000000000 +0200
 @@ -44,16 +44,20 @@
  #endif
  
@@ -79,3 +79,19 @@
  
  inline int vnl_math_ceil(float  x)
  {
+Index: vxl-1.14.0/core/vil/vil_round.h
+===================================================================
+--- vxl-1.14.0.orig/core/vil/vil_round.h	2011-04-19 12:56:23.000000000 +0200
++++ vxl-1.14.0/core/vil/vil_round.h	2011-04-19 12:56:15.000000000 +0200
+@@ -25,9 +25,10 @@
+ # endif
+ #endif
+ 
++#define DEFINED_INTEL    (defined(__i386__) || defined(__x86_64__))
+ // Turn on fast impl when using GCC on Intel-based machines with the following exception:
+ //   PPC with Mac OS X
+-#if defined(__GNUC__) && (!defined(__APPLE__)  || !defined(__ppc__) )
++#if defined(__GNUC__) && DEFINED_INTEL
+ # define GCC_USE_FAST_IMPL 1
+ #else
+ # define GCC_USE_FAST_IMPL 0