BF: fix various Windows errors

matthew-brett · matthew-brett · commit e8bebfaa8c49 · 2018-01-15T15:43:53.000Z
We assume things like uint == uintp type, and intp == long, which are
not true on Windows 64 bit.

[skip ci]
diff --git a/nipy/algorithms/group/parcel_analysis.py b/nipy/algorithms/group/parcel_analysis.py
@@ -251,7 +251,7 @@ def __init__(self, con_imgs, parcel_img, parcel_info=None,
         # load the parcellation and resample it at the appropriate
         # resolution
         self.reference = parcel_img.reference
-        self.parcel_full_res = parcel_img.get_data().astype('uint').squeeze()
+        self.parcel_full_res = parcel_img.get_data().astype('uintp').squeeze()
         self.affine_full_res = xyz_affine(parcel_img)
         parcel_img = make_xyz_image(self.parcel_full_res,
                                     self.affine_full_res,
@@ -261,7 +261,7 @@ def __init__(self, con_imgs, parcel_img, parcel_info=None,
                                   reference=(self.con_imgs[0].shape,
                                              self.affine),
                                   interp_order=0)
-        self.parcel = parcel_img_rsp.get_data().astype('uint').squeeze()
+        self.parcel = parcel_img_rsp.get_data().astype('uintp').squeeze()
         if self.msk is None:
             self.msk = self.parcel > 0
 
diff --git a/nipy/algorithms/registration/histogram_registration.py b/nipy/algorithms/registration/histogram_registration.py
@@ -19,7 +19,7 @@
 from .similarity_measures import similarity_measures as _sms
 from ._registration import _joint_histogram
 
-MAX_INT = np.iinfo(np.intp).max
+MAX_INT = np.iinfo(np.int).max
 
 # Module globals
 VERBOSE = True  # enables online print statements
