From c81888005d3d0bc23715c41dfcee4a6889be1590 Mon Sep 17 00:00:00 2001
From: Paul McCarthy <pauldmccarthy@gmail.com>
Date: Mon, 24 Jun 2019 18:59:04 +0930
Subject: [PATCH] RF: Tweak bitmap data organisation
---
fsl/data/bitmap.py | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/fsl/data/bitmap.py b/fsl/data/bitmap.py
index 1f6641716..c7d172c25 100644
--- a/fsl/data/bitmap.py
+++ b/fsl/data/bitmap.py
@@ -64,9 +64,9 @@ class Bitmap(object):
raise ValueError('unknown bitmap: {}'.format(bmp))
# Make the array (w, h, c)
- data = data.transpose((1, 0, 2))
- w, h = data.shape[:2]
- data = np.array(data, dtype=np.uint8, order='C')
+ data = np.fliplr(data.transpose((1, 0, 2)))
+ data = np.array(data, dtype=np.uint8, order='C')
+ w, h = data.shape[:2]
self.__data = data
self.__dataSource = source
@@ -149,7 +149,9 @@ class Bitmap(object):
else:
data = np.zeros((width, height), dtype=dtype)
- for ch, ci in enumerate(dtype.names):
+ for ci, ch in enumerate(dtype.names):
data[ch] = self.data[..., ci]
- return fslimage.Image(data, np.eye(4))
+ data = np.array(data, order='F', copy=False)
+
+ return fslimage.Image(data, name=self.name)
--
GitLab