fix more stuff

Author: Mathieu Scheltienne

nibabel/ecat.py

@@ -923,7 +923,7 @@ def _write_data(self, data, stream, pos, dtype=None, endianness=None):
             endianness = native_code
 
         stream.seek(pos)
-        make_array_writer(data.newbyteorder(endianness), dtype).to_fileobj(stream)
+        make_array_writer(data.view(data.dtype.newbyteorder(endianness)), dtype).to_fileobj(stream)
 
     def to_file_map(self, file_map=None):
         """Write ECAT7 image to `file_map` or contained ``self.file_map``

nibabel/freesurfer/tests/test_io.py

@@ -111,8 +111,10 @@ def test_geometry():
     assert np.array_equal(faces, faces2)
 
     # Validate byte ordering
-    coords_swapped = coords.byteswap().newbyteorder()
-    faces_swapped = faces.byteswap().newbyteorder()
+    coords_swapped = coords.byteswap()
+    coords_swapped = coords_swapped.view(coords_swapped.dtype.newbyteorder())
+    faces_swapped = faces.byteswap()
+    faces_swapped = faces_swapped.view(faces_swapped.dtype.newbyteorder())
     assert np.array_equal(coords_swapped, coords)
     assert np.array_equal(faces_swapped, faces)
 

nibabel/nifti1.py

@@ -2443,9 +2443,13 @@ def _get_analyze_compat_dtype(arr):
         return np.dtype('int16' if arr.max() <= np.iinfo(np.int16).max else 'int32')
 
     mn, mx = arr.min(), arr.max()
-    if np.can_cast(mn, np.int32) and np.can_cast(mx, np.int32):
+    if (isinstance(mn, int) and isinstance(mx, int)) or (
+        np.can_cast(mn, np.int32) and np.can_cast(mx, np.int32)
+    ):
         return np.dtype('int32')
-    if np.can_cast(mn, np.float32) and np.can_cast(mx, np.float32):
+    if (isinstance(mn, float) and isinstance(mx, float)) or (
+        np.can_cast(mn, np.float32) and np.can_cast(mx, np.float32)
+    ):
         return np.dtype('float32')
 
     raise ValueError(