From 1c4fc7782ac7ac1235c91050ab79f2ce8f8cf1cf Mon Sep 17 00:00:00 2001
From: Paul McCarthy <pauld.mccarthy@gmail.com>
Date: Fri, 11 Nov 2016 17:17:22 +0000
Subject: [PATCH] Suppress numpy warnings about float shape
---
fsl/utils/layout.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/fsl/utils/layout.py b/fsl/utils/layout.py
index 00897df13..95f1e40cc 100644
--- a/fsl/utils/layout.py
+++ b/fsl/utils/layout.py
@@ -197,8 +197,8 @@ def padBitmap(bitmap, width, height, vert, bgColour):
if vert:
if iwidth < width:
- lpad = np.floor((width - iwidth) / 2.0)
- rpad = np.ceil( (width - iwidth) / 2.0)
+ lpad = int(np.floor((width - iwidth) / 2.0))
+ rpad = int(np.ceil( (width - iwidth) / 2.0))
lpad = np.zeros((iheight, lpad, 4), dtype=np.uint8)
rpad = np.zeros((iheight, rpad, 4), dtype=np.uint8)
lpad[:] = bgColour
@@ -206,8 +206,8 @@ def padBitmap(bitmap, width, height, vert, bgColour):
bitmap = np.hstack((lpad, bitmap, rpad))
else:
if iheight < height:
- tpad = np.floor((height - iheight) / 2.0)
- bpad = np.ceil(( height - iheight) / 2.0)
+ tpad = int(np.floor((height - iheight) / 2.0))
+ bpad = int(np.ceil(( height - iheight) / 2.0))
tpad = np.zeros((tpad, iwidth, 4), dtype=np.uint8)
bpad = np.zeros((bpad, iwidth, 4), dtype=np.uint8)
tpad[:] = bgColour
--
GitLab