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

scipy-svn@scip... scipy-svn@scip...
Mon Apr 30 08:56:02 CDT 2007


Author: stefan
Date: 2007-04-30 08:55:42 -0500 (Mon, 30 Apr 2007)
New Revision: 2947

Modified:
   trunk/Lib/ndimage/src/nd_image.h
Log:
Rely on numpy to determine width of LONG.


Modified: trunk/Lib/ndimage/src/nd_image.h
===================================================================
--- trunk/Lib/ndimage/src/nd_image.h	2007-04-26 12:47:51 UTC (rev 2946)
+++ trunk/Lib/ndimage/src/nd_image.h	2007-04-30 13:55:42 UTC (rev 2947)
@@ -61,12 +61,8 @@
      tComplex128=PyArray_COMPLEX128,
      tObject=PyArray_OBJECT,        /* placeholder... does nothing */
      tMaxType=PyArray_NTYPES,
-     tDefault = tFloat64,
-#if NPY_BITSOF_LONG == 64
-     tLong = tInt64,
-#else
-     tLong = tInt32,
-#endif
+     tDefault=PyArray_FLOAT64,
+     tLong=PyArray_LONG,
 } NumarrayType;
 
 #define NI_MAXDIM NPY_MAXDIMS



More information about the Scipy-svn mailing list