From 11c558b424cb27d5651bd8ed2cbd17facb516d64 Mon Sep 17 00:00:00 2001
From: Paul McCarthy <pauldmccarthy@gmail.com>
Date: Tue, 30 Nov 2021 19:50:20 +0000
Subject: [PATCH] MNT: Rudimentary support for JPEG 2000. Would be better to
automatically infer type
---
fsl/data/bitmap.py | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/fsl/data/bitmap.py b/fsl/data/bitmap.py
index 4562300a7..f101a0dda 100644
--- a/fsl/data/bitmap.py
+++ b/fsl/data/bitmap.py
@@ -22,7 +22,8 @@ log = logging.getLogger(__name__)
BITMAP_EXTENSIONS = ['.bmp', '.png', '.jpg', '.jpeg',
- '.tif', '.tiff', '.gif', '.rgba']
+ '.tif', '.tiff', '.gif', '.rgba',
+ '.jp2', '.jpg2', '.jp2k']
"""File extensions we understand. """
@@ -34,7 +35,10 @@ BITMAP_DESCRIPTIONS = [
'TIFF',
'TIFF',
'Graphics Interchange Format',
- 'Raw RGBA']
+ 'Raw RGBA',
+ 'JPEG 2000',
+ 'JPEG 2000',
+ 'JPEG 2000']
"""A description for each :attr:`BITMAP_EXTENSION`. """
@@ -54,9 +58,11 @@ class Bitmap(object):
if isinstance(bmp, (pathlib.Path, str)):
try:
- # Allow big images
- import PIL.Image as Image
- Image.MAX_IMAGE_PIXELS = 1e9
+ # Allow big/truncated images
+ import PIL.Image as Image
+ import PIL.ImageFile as ImageFile
+ Image .MAX_IMAGE_PIXELS = None
+ ImageFile.LOAD_TRUNCATED_IMAGES = True
except ImportError:
raise RuntimeError('Install Pillow to use the Bitmap class')
--
GitLab