Merge branch 'dev' into fix/affine-transform-align-corners

Author: aymuos15

monai/data/image_reader.py

@@ -1102,7 +1102,8 @@ def get_data(self, img) -> tuple[np.ndarray, dict]:
         This function returns two objects, first is numpy array of image data, second is dict of metadata.
         It constructs `affine`, `original_affine`, and `spatial_shape` and stores them in meta dict.
         When loading a list of files, they are stacked together at a new dimension as the first dimension,
-        and the metadata of the first image is used to present the output metadata.
+        and the metadata of the first image is used to present the output metadata. The returned arrays
+        preserve the ordering in the original data, typically this is F-ordering for NIfTI files.
 
         Args:
             img: a Nibabel image object loaded from an image file or a list of Nibabel image objects.
@@ -1217,7 +1218,7 @@ def _get_array_data(self, img, filename):
             data_offset = img.dataobj.offset
             data_dtype = img.dataobj.dtype
             return image[data_offset:].view(data_dtype).reshape(data_shape, order="F")
-        return np.asanyarray(img.dataobj, order="C")
+        return np.asanyarray(img.dataobj)
 
 
 class NumpyReader(ImageReader):

tests/data/test_init_reader.py

@@ -11,8 +11,12 @@
 
 from __future__ import annotations
 
+import os
+import tempfile
 import unittest
 
+import numpy as np
+
 from monai.data import ITKReader, NibabelReader, NrrdReader, NumpyReader, PILReader, PydicomReader
 from monai.transforms import LoadImage, LoadImaged
 from tests.test_utils import SkipIfNoModule
@@ -76,6 +80,26 @@ def test_readers_to_gpu(self):
             inst = NibabelReader(to_gpu=to_gpu)
             self.assertIsInstance(inst, NibabelReader)
 
+    @SkipIfNoModule("nibabel")
+    def test_nibabel_reader_avoids_eager_c_order_copy(self):
+        import nibabel as nib
+
+        test_image = np.arange(2 * 3 * 4, dtype=np.int16).reshape(2, 3, 4)
+        with tempfile.TemporaryDirectory() as tempdir:
+            for suffix in (".nii", ".nii.gz"):
+                with self.subTest(suffix=suffix):
+                    filename = os.path.join(tempdir, f"test_image{suffix}")
+                    nib.save(nib.Nifti1Image(test_image, np.eye(4)), filename)
+
+                    reader = NibabelReader(mmap=False)
+                    img = reader.read(filename)
+                    data, _ = reader.get_data(img)
+
+                    np.testing.assert_array_equal(data, test_image)
+                    # The reader must not force an eager C-order copy; the native
+                    # (F-order) layout from nibabel should be preserved here.
+                    self.assertFalse(data.flags.c_contiguous)
+
 
 if __name__ == "__main__":
     unittest.main()