Glymur 0.13.2.post1__py3-none-any.whl → 0.13.4__py3-none-any.whl

{Glymur-0.13.2.post1.dist-info → Glymur-0.13.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Glymur
-Version: 0.13.2.post1
+Version: 0.13.4
 Home-page: https://github.com/quintusdias/glymur
 Author: 'John Evans'
 Author-email: "John Evans" <jevans667cc@proton.me>

{Glymur-0.13.2.post1.dist-info → Glymur-0.13.4.dist-info}/RECORD

@@ -1,15 +1,15 @@
 glymur/__init__.py,sha256=k14IfdaYuTWXSpAIDR3LVDtXt9XKjr-ZSNXCyu8pQko,586
 glymur/_iccprofile.py,sha256=_WfQsT-BqEWQzQVTtuY7tSXqPjOtwvWGW36rKxlLv1s,4148
-glymur/codestream.py,sha256=SEAudOSnGT1yWz-zDeIvDPmr7T1Gqhwc0tfErCHOBQw,60028
+glymur/codestream.py,sha256=In4WjEhm9pjIOgrXOTzX-G2imF13K_o7aV8Dz4uOMhs,60295
 glymur/command_line.py,sha256=jm-6dD2jcU_G7mJAJ0U5sanfG9kRy-j0-G3eSN_Ieek,7476
 glymur/config.py,sha256=ceGulS8TN2OYiTPtq3mAdhXrCCRlxjuLmvN_UG0009Y,4139
 glymur/core.py,sha256=IDkk8FESyukQTB10LHBZ4VQM36NwKE4CXCcuJ407Kzg,3638
-glymur/jp2box.py,sha256=bRzsq3UtZDVkM-_swwAdieSNZM7RsIE4tRNvOM1vnVo,112391
-glymur/jp2k.py,sha256=TfHsP6ozMCKFcP26r_ouHw-GVD3OY_UChAh-EAJsKD4,54555
-glymur/jp2kr.py,sha256=Jju0hNfLane24wqR8amQqiSR1qSNCxNydVC8FXQMOFQ,31497
+glymur/jp2box.py,sha256=qh1xUGKoGgVrUHq48yRcJAk7miJ__Udua8QHPTxpfQY,112434
+glymur/jp2k.py,sha256=o2Pg0GgbLd4nto8woYFCmvVemrqMDKXWGgt64fZbjuQ,54520
+glymur/jp2kr.py,sha256=hUxFRXaJI9qmnZ7wNPr_4N-c-JEP7YiM_ea4FpmWD_w,32358
 glymur/options.py,sha256=Y777g4wpxPqRAF8s963goeAIogfLqIe_Dyd9f77MfmU,4428
 glymur/tiff.py,sha256=2uoKfyoyPQWAsdPWB0IxW_npqpP4O10qVADQZf10jXs,41115
-glymur/version.py,sha256=SyTlhhJibQo-BAOWfdWM6AHvrP2kTaf9LwDg1wmpCwY,987
+glymur/version.py,sha256=aSurVIzgqNAnAJrBLPJKDh99onXgPAcWVn99bnX4wus,981
 glymur/data/__init__.py,sha256=n2KZrHV15it7Wu4YCaBLXui1ZleQ30dnZ92dyP6q05k,955
 glymur/data/goodstuff.j2k,sha256=xKQG68KMu33gYjRUDTQvam1Cue2tdio85rNp5J-rYZE,115220
 glymur/data/heliov.jpx,sha256=KXnYdBZgl25jcGLu-m-QfhuP9pqUXV0Hp9HHEdJqr34,1399071
@@ -17,9 +17,9 @@ glymur/data/nemo.jp2,sha256=yJ1NkTEwU0B_gBtAiA1c5hxtGYSJtJgq6cHC2IHpj70,1132373
 glymur/lib/__init__.py,sha256=JnM9oPfcZhBDLKo7_yLS-lIRQ1wXb1N9hKKQ-G7vYVk,127
 glymur/lib/openjp2.py,sha256=VHCy_TnBSDqQ8YlIQHkyFqUXOQ2E5C3jxJoziG73s0I,45052
 glymur/lib/tiff.py,sha256=2o29IzYTsprVR_C6VDNHOzqk_U7aUdCoLQ2fjiyyoaI,50777
-Glymur-0.13.2.post1.dist-info/LICENSE.txt,sha256=G9pvBgkJdPTtZqQmoRyIgAydtic1ZwWtOWBea9VMW7I,1077
-Glymur-0.13.2.post1.dist-info/METADATA,sha256=mwhG68eNzkHr3io8UL_arGeWPK0Mu0ygYezBTS3g9uE,1026
-Glymur-0.13.2.post1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-Glymur-0.13.2.post1.dist-info/entry_points.txt,sha256=inzxpDbDDfIxtdXpCncAHdAdwJfjtXt3xKvIOsuZsG8,93
-Glymur-0.13.2.post1.dist-info/top_level.txt,sha256=D0SvtBUoPxOs40OTRW3l-kjGFHM6VrXS8yZPK5Fx2wY,7
-Glymur-0.13.2.post1.dist-info/RECORD,,
+Glymur-0.13.4.dist-info/LICENSE.txt,sha256=G9pvBgkJdPTtZqQmoRyIgAydtic1ZwWtOWBea9VMW7I,1077
+Glymur-0.13.4.dist-info/METADATA,sha256=R0fok_sUg2bhWbDOWZowQ6jjzRJFBI5SNKhRCw_JkkI,1020
+Glymur-0.13.4.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
+Glymur-0.13.4.dist-info/entry_points.txt,sha256=inzxpDbDDfIxtdXpCncAHdAdwJfjtXt3xKvIOsuZsG8,93
+Glymur-0.13.4.dist-info/top_level.txt,sha256=D0SvtBUoPxOs40OTRW3l-kjGFHM6VrXS8yZPK5Fx2wY,7
+Glymur-0.13.4.dist-info/RECORD,,

{Glymur-0.13.2.post1.dist-info → Glymur-0.13.4.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.43.0)
+Generator: setuptools (70.2.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

glymur/codestream.py

@@ -736,7 +736,9 @@ class Codestream(object):
         data = struct.unpack_from('>HIIIIIIIIH', read_buffer)
 
         rsiz = data[0]
-        if rsiz not in _KNOWN_PROFILES:
+
+        # Bit 14 (16384) signifies HTJ2K (JPH)
+        if rsiz not in _KNOWN_PROFILES and not np.bitwise_and(rsiz, 16384):
             msg = f"Invalid profile: (Rsiz={rsiz})."
             warnings.warn(msg, UserWarning)
 
@@ -767,11 +769,10 @@ class Codestream(object):
             num_tiles_y = (xysiz[1] - xyosiz[1]) / (xytsiz[1] - xytosiz[1])
         except ZeroDivisionError:
             msg = (
-                f"Invalid tile specification:  "
-                f"size of {xytsiz[1]} x {xytsiz[0]}, "
-                f"offset of {xytosiz[1]} x {xytsiz[0]}."
+                f"Invalid tile specification in SIZ segment at byte offset "
+                f"{offset}:  tile size of {xytsiz[1]} x {xytsiz[0]}."
             )
-            warnings.warn(msg, UserWarning)
+            raise ZeroDivisionError(msg)
         else:
             numtiles = np.ceil(num_tiles_x) * np.ceil(num_tiles_y)
             if numtiles > 65535:
@@ -1667,7 +1668,12 @@ class SIZsegment(Segment):
         try:
             profile = _CAPABILITIES_DISPLAY[self.rsiz]
         except KeyError:
-            profile = f'{self.rsiz} (invalid)'
+            if np.bitwise_and(self.rsiz, 16384):
+                # HTJ2K profile that is uninterpreted
+                profile = f'{self.rsiz}'
+            else:
+                # profile unknown
+                profile = f'{self.rsiz} (invalid)'
         msg = msg.format(
             profile=profile,
             height=self.ysiz, width=self.xsiz,

glymur/jp2box.py

@@ -71,7 +71,7 @@ _EXIF_UUID = UUID(bytes=b'JpgTiffExif->JP2')
 _XMP_UUID = UUID('be7acfcb-97a9-42e8-9c71-999491e3afac')
 
 
-class InvalidJp2kWarning(RuntimeError):
+class InvalidJp2kWarning(UserWarning):
     """Issue this warning in case the file is technically invalid but we can
     still read the image.
     """
@@ -1259,7 +1259,7 @@ class FileTypeBox(Jp2kBox):
     """
     box_id = 'ftyp'
     longname = 'File Type'
-    _valid_cls = ['jp2 ', 'jpx ', 'jpxb']
+    _valid_cls = ['jp2 ', 'jph ', 'jpx ', 'jpxb']
 
     def __init__(
         self, brand='jp2 ', minor_version=0, compatibility_list=None,
@@ -1304,16 +1304,19 @@ class FileTypeBox(Jp2kBox):
         return text
 
     def _validate(self, writing=False):
-        """Validate the box before writing to file."""
-        if self.brand not in ['jp2 ', 'jpx ']:
+        """
+        Validate the box before writing to file.
+        """
+        if self.brand not in ['jp2 ', 'jpx ', 'jph ']:
             msg = (
                 f"The file type brand was '{self.brand}'.  "
-                f"It should be either 'jp2 ' or 'jpx '."
+                f"It should be either 'jp2 ', 'jpx ', or 'jph '."
             )
             if writing:
                 raise InvalidJp2kError(msg)
             else:
                 warnings.warn(msg, UserWarning)
+
         for item in self.compatibility_list:
             if item not in self._valid_cls:
                 msg = (

glymur/jp2k.py

@@ -206,13 +206,13 @@ class Jp2k(Jp2kr):
             # Must be determined when writing.
             self._shape = None
 
-        # If there already was a shape attribute, then don't mess with it,
-        # it was set by the reader superclass.
-
-        if self.filename[-4:].endswith(('.jp2', '.JP2', '.jpx', 'JPX')):
-            self._codec_format = opj2.CODEC_JP2
-        else:
-            self._codec_format = opj2.CODEC_J2K
+        if not hasattr(self, '_codec_format'):
+            # Only set codec format if the superclass has not done so, i.e.
+            # we are writing instead of reading.
+            if self.filename[-4:].endswith(('.jp2', '.JP2', '.jpx', 'JPX')):
+                self._codec_format = opj2.CODEC_JP2
+            else:
+                self._codec_format = opj2.CODEC_J2K
 
         self._validate_kwargs()
 
@@ -258,7 +258,7 @@ class Jp2k(Jp2kr):
         header box if we were so instructed.  This requires a wrapping
         operation.
         """
-        jp2h = [box for box in self.box if box.box_id == 'jp2h'][0]
+        jp2h = next(filter(lambda x: x.box_id == 'jp2h', self.box), None)
 
         extra_boxes = []
         if self._capture_resolution is not None:
@@ -1125,8 +1125,7 @@ class Jp2k(Jp2kr):
 
     def _validate_jp2_colr(self, boxes):
         """Validate JP2 requirements on colour specification boxes."""
-        lst = [box for box in boxes if box.box_id == 'jp2h']
-        jp2h = lst[0]
+        jp2h = next(filter(lambda x: x.box_id == 'jp2h', boxes), None)
         for colr in [box for box in jp2h.box if box.box_id == 'colr']:
             if colr.approximation != 0:
                 msg = (
@@ -1161,19 +1160,21 @@ class Jp2k(Jp2kr):
     def _validate_jp2c(self, boxes):
         """Validate the codestream box in relation to other boxes."""
         # jp2c must be preceeded by jp2h
-        jp2h_lst = [idx for (idx, box) in enumerate(boxes)
-                    if box.box_id == 'jp2h']
-        jp2h_idx = jp2h_lst[0]
-        jp2c_lst = [idx for (idx, box) in enumerate(boxes)
-                    if box.box_id == 'jp2c']
-        if len(jp2c_lst) == 0:
+        jp2h_idx, _ = next(
+            filter(lambda x: x[1].box_id == 'jp2h', enumerate(boxes)),
+            (None, None)
+        )
+        jp2c_idx, _ = next(
+            filter(lambda x: x[1].box_id == 'jp2c', enumerate(boxes)),
+            (None, None)
+        )
+        if jp2c_idx is None:
             msg = (
                 "A codestream box must be defined in the outermost list of "
                 "boxes."
             )
             raise InvalidJp2kError(msg)
 
-        jp2c_idx = jp2c_lst[0]
         if jp2h_idx >= jp2c_idx:
             msg = "The codestream box must be preceeded by a jp2 header box."
             raise InvalidJp2kError(msg)
@@ -1182,8 +1183,7 @@ class Jp2k(Jp2kr):
         """Validate the JP2 Header box."""
         self._check_jp2h_child_boxes(boxes, 'top-level')
 
-        jp2h_lst = [box for box in boxes if box.box_id == 'jp2h']
-        jp2h = jp2h_lst[0]
+        jp2h = next(filter(lambda x: x.box_id == 'jp2h', boxes), None)
 
         # 1st jp2 header box cannot be empty.
         if len(jp2h.box) == 0:
@@ -1199,20 +1199,18 @@ class Jp2k(Jp2kr):
             raise InvalidJp2kError(msg)
 
         # colr must be present in jp2 header box.
-        colr_lst = [
-            j for (j, box) in enumerate(jp2h.box) if box.box_id == 'colr'
-        ]
-        if len(colr_lst) == 0:
+        colr = next(filter(lambda x: x.box_id == 'colr', jp2h.box), None)
+        if colr is None:
             msg = "The jp2 header box must contain a color definition box."
             raise InvalidJp2kError(msg)
-        colr = jp2h.box[colr_lst[0]]
 
         self._validate_channel_definition(jp2h, colr)
 
     def _validate_channel_definition(self, jp2h, colr):
         """Validate the channel definition box."""
-        cdef_lst = [j for (j, box) in enumerate(jp2h.box)
-                    if box.box_id == 'cdef']
+        cdef_lst = [
+            idx for (idx, box) in enumerate(jp2h.box) if box.box_id == 'cdef'
+        ]
         if len(cdef_lst) > 1:
             msg = ("Only one channel definition box is allowed in the "
                    "JP2 header.")

glymur/jp2kr.py

@@ -9,11 +9,11 @@ License:  MIT
 # Standard library imports...
 from __future__ import annotations
 from contextlib import ExitStack
-from itertools import filterfalse
 import ctypes
 import pathlib
 import re
 import struct
+import sys
 import warnings
 
 # Third party library imports
@@ -22,7 +22,7 @@ import numpy as np
 # Local imports...
 from .codestream import Codestream
 from . import core, version, get_option
-from .jp2box import Jp2kBox, FileTypeBox, InvalidJp2kError
+from .jp2box import Jp2kBox, FileTypeBox, InvalidJp2kError, InvalidJp2kWarning
 from .lib import openjp2 as opj2
 
 
@@ -108,8 +108,8 @@ class Jp2kr(Jp2kBox):
             num_components = len(cstr.segment[1].xrsiz)
         else:
             # try to get the image size from the IHDR box
-            jp2h = [box for box in self.box if box.box_id == 'jp2h'][0]
-            ihdr = [box for box in jp2h.box if box.box_id == 'ihdr'][0]
+            jp2h = next(filter(lambda x: x.box_id == 'jp2h', self.box), None)
+            ihdr = next(filter(lambda x: x.box_id == 'ihdr', jp2h.box), None)
 
             height, width = ihdr.height, ihdr.width
             num_components = ihdr.num_components
@@ -189,10 +189,10 @@ class Jp2kr(Jp2kBox):
     @layer.setter
     def layer(self, layer):
         # Set to the indicated value so long as it is valid.
-        cod = [
-            segment for segment in self.codestream.segment
-            if segment.marker_id == 'COD'
-        ][0]
+        cod = next(
+            filter(lambda x: x.marker_id == 'COD', self.codestream.segment),
+            None
+        )
         if layer < 0 or layer >= cod.layers:
             msg = f"Invalid layer number, must be in range [0, {cod.layers})."
             raise ValueError(msg)
@@ -355,7 +355,13 @@ class Jp2kr(Jp2kBox):
             # Don't bother trying to validate JPX.
             return
 
-        jp2h = [box for box in self.box if box.box_id == 'jp2h'][0]
+        jp2h = next(filter(lambda x: x.box_id == 'jp2h', self.box), None)
+        if jp2h is None:
+            msg = (
+                "No JP2 header box was located in the outermost jacket of "
+                "boxes."
+            )
+            raise InvalidJp2kError(msg)
 
         # An IHDR box is required as the first child box of the JP2H box.
         if jp2h.box[0].box_id != 'ihdr':
@@ -373,7 +379,7 @@ class Jp2kr(Jp2kBox):
                     "enumerated colorspace or a restricted ICC profile if the "
                     "file type box brand is 'jp2 '."
                 )
-                warnings.warn(msg, UserWarning)
+                warnings.warn(msg, InvalidJp2kWarning)
 
         # We need to have one and only one JP2H box if we have a JP2 file.
         num_jp2h_boxes = len([box for box in self.box if box.box_id == 'jp2h'])
@@ -382,7 +388,7 @@ class Jp2kr(Jp2kBox):
                 f"This file has {num_jp2h_boxes} JP2H boxes in the outermost "
                 "layer of boxes.  There should only be one."
             )
-            warnings.warn(msg)
+            warnings.warn(msg, InvalidJp2kWarning)
 
         # We should have one and only one JP2C box if we have a JP2 file.
         num_jp2c_boxes = len([box for box in self.box if box.box_id == 'jp2c'])
@@ -404,10 +410,10 @@ class Jp2kr(Jp2kBox):
         ihdr = jp2h.box[0]
         ihdr_dims = ihdr.height, ihdr.width, ihdr.num_components
 
-        siz = [
-            segment for segment in self.codestream.segment
-            if segment.marker_id == 'SIZ'
-        ][0]
+        siz = next(
+            filter(lambda x: x.marker_id == 'SIZ', self.codestream.segment),
+            None
+        )
 
         siz_dims = (siz.ysiz, siz.xsiz, len(siz.bitdepth))
         if ihdr_dims != siz_dims:
@@ -460,9 +466,9 @@ class Jp2kr(Jp2kBox):
         if isinstance(pargs, tuple) and any(isinstance(x, int) for x in pargs):
             # Replace the first such integer argument, replace it with a slice.
             lst = list(pargs)
-            g = filterfalse(lambda x: not isinstance(x[1], int),
-                            enumerate(pargs))
-            idx = next(g)[0]
+            idx, _ = next(
+                filter(lambda x: isinstance(x[1], int), enumerate(lst)), None
+            )
             lst[idx] = slice(pargs[idx], pargs[idx] + 1)
             newindex = tuple(lst)
 
@@ -676,10 +682,13 @@ class Jp2kr(Jp2kBox):
         # Must check the specified rlevel against the maximum.
         if rlevel != 0:
             # Must check the specified rlevel against the maximum.
-            cod_seg = [
-                segment for segment in self.codestream.segment
-                if segment.marker_id == 'COD'
-            ][0]
+            cod_seg = next(
+                filter(
+                    lambda x: x.marker_id == 'COD',
+                    self.codestream.segment
+                ),
+                None
+            )
             max_rlevel = cod_seg.num_res
             if rlevel == -1:
                 # -1 is shorthand for the largest rlevel
@@ -889,25 +898,45 @@ class Jp2kr(Jp2kBox):
             Vertical, Horizontal Subsampling:  ((1, 1), (1, 1), (1, 1))
         """
         with self.path.open('rb') as fptr:
+
+            # if it's just a raw codestream file, it's easy
             if self._codec_format == opj2.CODEC_J2K:
-                codestream = Codestream(fptr, self.length,
-                                        header_only=header_only)
-            else:
-                box = [x for x in self.box if x.box_id == 'jp2c']
-                fptr.seek(box[0].offset)
+                return self._get_codestream(fptr, self.length, header_only)
+
+            # continue assuming JP2, must seek to the JP2C box and past its
+            # header
+            box = next(filter(lambda x: x.box_id == 'jp2c', self.box), None)
+
+            fptr.seek(box.offset)
+            read_buffer = fptr.read(8)
+            (box_length, _) = struct.unpack('>I4s', read_buffer)
+            if box_length == 0:
+                # The length of the box is presumed to last until the end
+                # of the file.  Compute the effective length of the box.
+                box_length = self.path.stat().st_size - fptr.tell() + 8
+            elif box_length == 1:
+                # Seek past the XL field.
                 read_buffer = fptr.read(8)
-                (box_length, _) = struct.unpack('>I4s', read_buffer)
-                if box_length == 0:
-                    # The length of the box is presumed to last until the end
-                    # of the file.  Compute the effective length of the box.
-                    box_length = self.path.stat().st_size - fptr.tell() + 8
-                elif box_length == 1:
-                    # Seek past the XL field.
-                    read_buffer = fptr.read(8)
-                    box_length, = struct.unpack('>Q', read_buffer)
-                codestream = Codestream(fptr, box_length - 8,
-                                        header_only=header_only)
+                box_length, = struct.unpack('>Q', read_buffer)
+
+            return self._get_codestream(fptr, box_length - 8, header_only)
+
+    def _get_codestream(self, fptr, length, header_only):
+        """
+        Parsing errors can make for confusing errors sometimes, so catch any
+        such error and add context to it.
+        """
 
+        try:
+            codestream = Codestream(fptr, length, header_only=header_only)
+        except Exception:
+            _, value, traceback = sys.exc_info()
+            msg = (
+                f'The file is invalid '
+                f'because the codestream could not be parsed:  "{value}"'
+            )
+            raise InvalidJp2kError(msg).with_traceback(traceback)
+        else:
             return codestream
 
     def _validate_nonzero_image_size(self, nrows, ncols, component_index):

glymur/version.py

@@ -20,7 +20,7 @@ from .lib import tiff
 
 # Do not change the format of this next line!  Doing so risks breaking
 # setup.py
-version = "0.13.2.post1"
+version = "0.13.4"
 
 version_tuple = parse(version).release