fix binary image for endianness

Author: kif

src/fabio/binaryimage.py

@@ -38,7 +38,7 @@
 __contact__ = "[email protected]"
 __license__ = "MIT"
 __copyright__ = "European Synchrotron Radiation Facility, Grenoble, France"
-__version__ = "17/10/2012"
+__date__ = "30/05/2024"
 
 import io
 from .fabioimage import FabioImage
@@ -84,17 +84,21 @@ def read(self, fname, dim1, dim2, offset=0, bytecode="int32", endian="<"):
         :param int dim2: image dimensions (Slow index)
         :param int offset: starting position of the data-block. If negative, starts at the end.
         :param bytecode: can be "int8","int16","int32","int64","uint8","uint16","uint32","uint64","float32","float64",...
-        :param endian:  among short or long endian ("<" or ">")
+        :param endian:  among litte or big endian ("<" or ">")
 
         """
+        assert endian in ('<', '>', '=')
+        bytecode = numpy.dtype(bytecode)
+        if not bytecode.str.startswith(endian):
+            bytecode = numpy.dtype(endian + bytecode.str[1:])
         self.filename = fname
         self._shape = dim2, dim1
         self._bytecode = bytecode
-        with open(self.filename, "rb") as f: 
+        with open(self.filename, "rb") as f:
             dims = [dim2, dim1]
             bpp = numpy.dtype(bytecode).itemsize
             size = dims[0] * dims[1] * bpp
-    
+
             if offset >= 0:
                 f.seek(offset)
             else:
@@ -107,8 +111,6 @@ def read(self, fname, dim1, dim2, offset=0, bytecode="int32", endian="<"):
                     logger.error('Uncommon error encountered when reading file')
             rawData = f.read(size)
         data = numpy.frombuffer(rawData, bytecode).copy().reshape(tuple(dims))
-        if self.swap_needed(endian):
-            data.byteswap(True)
         self.data = data
         self._shape = None
         return self

src/fabio/test/codecs/test_binaryimage.py

@@ -64,18 +64,16 @@ def test_read(self):
         self.assertEqual(e.shape, f.shape)
         self.assertEqual(e.bpp, f.bpp, "bpp OK")
         print(self.fn3)
-        self.assertEqual(abs(e.data-f.data).max(), 0, "data OK")
-        
-
+        self.assertEqual(abs(e.data - f.data).max(), 0, "data OK")
 
     def test_write(self):
         fn = os.path.join(UtilsTest.tempdir, "binary_write.h5")
         ary = numpy.random.randint(0, 100, size=self.shape)
-        e = BinaryImage(data = ary)
+        e = BinaryImage(data=ary)
         e.save(fn)
         self.assertTrue(os.path.exists(fn), "file exists")
         f = BinaryImage()
-        f.read(fn, self.shape[1], self.shape[0], offset=0, bytecode=ary.dtype)
+        f.read(fn, self.shape[1], self.shape[0], offset=0, bytecode=ary.dtype, endian=ary.dtype.str[0])
         self.assertEqual(str(f.__class__.__name__), "BinaryImage", "Used the write reader")
         self.assertEqual(self.shape, f.shape, "shape matches")
         self.assertEqual(abs(f.data - ary).max(), 0, "first frame matches")