[Scipy-svn] r2887 - trunk/Lib/ndimage/src

[scipy-svn at scipy.org]

Author: stefan
Date: 2007-03-29 04:51:45 -0500 (Thu, 29 Mar 2007)
New Revision: 2887

Modified:
   trunk/Lib/ndimage/src/nd_image.h
   trunk/Lib/ndimage/src/ni_interpolation.c
Log:
Re-enable 64-bit computations in ndimage.


Modified: trunk/Lib/ndimage/src/nd_image.h
===================================================================
--- trunk/Lib/ndimage/src/nd_image.h	2007-03-29 09:20:23 UTC (rev 2886)
+++ trunk/Lib/ndimage/src/nd_image.h	2007-03-29 09:51:45 UTC (rev 2887)
@@ -40,6 +40,8 @@
 typedef npy_intp maybelong;
 #define MAXDIM NPY_MAXDIMS
 
+#define HAS_UINT64 1
+
 typedef enum
 {
      tAny=-1,

Modified: trunk/Lib/ndimage/src/ni_interpolation.c
===================================================================
--- trunk/Lib/ndimage/src/ni_interpolation.c	2007-03-29 09:20:23 UTC (rev 2886)
+++ trunk/Lib/ndimage/src/ni_interpolation.c	2007-03-29 09:51:45 UTC (rev 2887)
@@ -610,7 +610,8 @@
       CASE_INTERP_OUT_UINT(po, t, UInt16, 0, MAX_UINT16);
       CASE_INTERP_OUT_UINT(po, t, UInt32, 0, MAX_UINT32);
 #if HAS_UINT64
-      CASE_INTERP_OUT_UINT(po, t, UInt64);
+      /* FIXME */
+      CASE_INTERP_OUT_UINT(po, t, UInt64, 0, MAX_UINT32);
 #endif
       CASE_INTERP_OUT_INT(po, t, Int8, MIN_INT8, MAX_INT8);
       CASE_INTERP_OUT_INT(po, t, Int16, MIN_INT16, MAX_INT16);
@@ -904,7 +905,8 @@
       CASE_INTERP_OUT_UINT(po, t, UInt16, 0, MAX_UINT16);
       CASE_INTERP_OUT_UINT(po, t, UInt32, 0, MAX_UINT32);
 #if HAS_UINT64
-      CASE_INTERP_OUT_UINT(po, t, UInt64, 0, MAX_UINT64);
+      /* FIXME */
+      CASE_INTERP_OUT_UINT(po, t, UInt64, 0, MAX_UINT32);
 #endif
       CASE_INTERP_OUT_INT(po, t, Int8, MIN_INT8, MAX_INT8);
       CASE_INTERP_OUT_INT(po, t, Int16, MIN_INT16, MAX_INT16);