Skip to content
Snippets Groups Projects
Commit 11c558b4 authored by Paul McCarthy's avatar Paul McCarthy :mountain_bicyclist:
Browse files

MNT: Rudimentary support for JPEG 2000. Would be better to automatically infer

type
parent 8d1f3fa3
No related branches found
No related tags found
No related merge requests found
...@@ -22,7 +22,8 @@ log = logging.getLogger(__name__) ...@@ -22,7 +22,8 @@ log = logging.getLogger(__name__)
BITMAP_EXTENSIONS = ['.bmp', '.png', '.jpg', '.jpeg', BITMAP_EXTENSIONS = ['.bmp', '.png', '.jpg', '.jpeg',
'.tif', '.tiff', '.gif', '.rgba'] '.tif', '.tiff', '.gif', '.rgba',
'.jp2', '.jpg2', '.jp2k']
"""File extensions we understand. """ """File extensions we understand. """
...@@ -34,7 +35,10 @@ BITMAP_DESCRIPTIONS = [ ...@@ -34,7 +35,10 @@ BITMAP_DESCRIPTIONS = [
'TIFF', 'TIFF',
'TIFF', 'TIFF',
'Graphics Interchange Format', 'Graphics Interchange Format',
'Raw RGBA'] 'Raw RGBA',
'JPEG 2000',
'JPEG 2000',
'JPEG 2000']
"""A description for each :attr:`BITMAP_EXTENSION`. """ """A description for each :attr:`BITMAP_EXTENSION`. """
...@@ -54,9 +58,11 @@ class Bitmap(object): ...@@ -54,9 +58,11 @@ class Bitmap(object):
if isinstance(bmp, (pathlib.Path, str)): if isinstance(bmp, (pathlib.Path, str)):
try: try:
# Allow big images # Allow big/truncated images
import PIL.Image as Image import PIL.Image as Image
Image.MAX_IMAGE_PIXELS = 1e9 import PIL.ImageFile as ImageFile
Image .MAX_IMAGE_PIXELS = None
ImageFile.LOAD_TRUNCATED_IMAGES = True
except ImportError: except ImportError:
raise RuntimeError('Install Pillow to use the Bitmap class') raise RuntimeError('Install Pillow to use the Bitmap class')
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment