From ecbb42bd5e5a794aeb6b312bc5f0ba5d8a0bfa07 Mon Sep 17 00:00:00 2001
From: Paul McCarthy <pauldmccarthy@gmail.com>
Date: Sun, 14 Jul 2019 15:21:22 +0100
Subject: [PATCH] BF: Transform->affine changes. Make sure we don't generate an
empty affine for coefficient fields
---
fsl/data/image.py | 6 +++---
fsl/data/mghimage.py | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/fsl/data/image.py b/fsl/data/image.py
index 415018c2a..e6b157091 100644
--- a/fsl/data/image.py
+++ b/fsl/data/image.py
@@ -337,9 +337,9 @@ class Nifti(notifier.Notifier, meta.Meta):
# get the shape/size of the coefficient
# field about right
knotpix = header.get_zooms()[:3]
- refpix = (header.get('intent_p1', 1),
- header.get('intent_p2', 1),
- header.get('intent_p3', 1))
+ refpix = (header.get('intent_p1', 1) or 1,
+ header.get('intent_p2', 1) or 1,
+ header.get('intent_p3', 1) or 1)
voxToWorldMat = affine.concat(
affine.scaleOffsetXform(refpix, 0),
affine.scaleOffsetXform(knotpix, 0))
diff --git a/fsl/data/mghimage.py b/fsl/data/mghimage.py
index fea4c9970..a143e06ce 100644
--- a/fsl/data/mghimage.py
+++ b/fsl/data/mghimage.py
@@ -69,7 +69,7 @@ class MGHImage(fslimage.Image):
self.__voxToSurfMat = vox2surf
self.__surfToVoxMat = affine.invert(vox2surf)
- self.__surfToWorldMat = affine.concat(affine, self.__surfToVoxMat)
+ self.__surfToWorldMat = affine.concat(xform, self.__surfToVoxMat)
self.__worldToSurfMat = affine.invert(self.__surfToWorldMat)
--
GitLab