Glymur 0.14.6__py3-none-any.whl → 0.14.7__py3-none-any.whl

glymur/jp2box.py

@@ -2,11 +2,11 @@
 
 References
 ----------
-.. [JP2K15444-1i] International Organization for Standardication.  ISO/IEC
+.. [JP2K15444-1i] International Organization for Standardization.  ISO/IEC
    15444-1:2004 - Information technology -- JPEG 2000 image coding system:
    Core coding system
 
-.. [JP2K15444-2m] International Organization for Standardication.  ISO/IEC
+.. [JP2K15444-2m] International Organization for Standardization.  ISO/IEC
    15444-2:2004 - Information technology -- JPEG 2000 image coding system:
    Extensions
 """
@@ -1065,7 +1065,7 @@ class ContiguousCodestreamBox(Jp2kBox):
         offset=-1
     ):
         super().__init__()
-        self._codestream = codestream
+        self.codestream = codestream
         self.length = length
         self.offset = offset
         self.main_header_offset = main_header_offset
@@ -1073,24 +1073,6 @@ class ContiguousCodestreamBox(Jp2kBox):
         # The filename can be set if lazy loading is desired.
         self._filename = None
 
-    @property
-    def codestream(self):
-        if get_option("parse.full_codestream") is True:
-            header_only = False
-        else:
-            header_only = True
-        if self._codestream is None:
-            if self._filename is not None:
-                with open(self._filename, "rb") as fptr:
-                    fptr.seek(self.main_header_offset)
-                    self._codestream = Codestream(
-                        fptr,
-                        self.length,
-                        header_only=header_only
-                    )
-
-        return self._codestream
-
     def __repr__(self):
         msg = "glymur.jp2box.ContiguousCodeStreamBox"
         msg += f"(codestream={repr(self.codestream)})"
@@ -1134,7 +1116,7 @@ class ContiguousCodestreamBox(Jp2kBox):
         if get_option("parse.full_codestream"):
             codestream = Codestream(fptr, length, header_only=False)
         else:
-            codestream = None
+            codestream = Codestream(fptr, length, header_only=True)
         box = cls(
             codestream,
             main_header_offset=main_header_offset,
@@ -3555,7 +3537,7 @@ class UUIDBox(Jp2kBox):
 
     References
     ----------
-    .. [XMP] International Organization for Standardication.  ISO/IEC
+    .. [XMP] International Organization for Standardization.  ISO/IEC
        16684-1:2012 - Graphic technology -- Extensible metadata platform (XMP)
        specification -- Part 1:  Data model, serialization and core properties
     """

glymur/jp2k.py

@@ -1079,8 +1079,9 @@ class Jp2k(Jp2kr):
         else:
             numrows, numcols, num_comps = self.shape
 
-        for k in range(num_comps):
-            self._validate_nonzero_image_size(numrows, numcols, k)
+        if 0 in imgdata.shape:
+            msg = f"The image has invalid dimensions, {imgdata.shape}."
+            raise InvalidJp2kError(msg)
 
         # set image offset and reference grid
         image.contents.x0 = self._cparams.image_offset_x0

glymur/jp2kr.py

@@ -455,6 +455,13 @@ class Jp2kr(Jp2kBox):
             # boxes) here.
             fptr.seek(0)
             self.box = self.parse_superbox(fptr)
+
+            # Set the codestream property if it is there.  Do this now because
+            # the validation process would otherwise cause another file-open to
+            # occur and re-parse the codestream (if it exists).
+            jp2c = next(filter(lambda x: x.box_id == 'jp2c', self.box), None)
+            self._codestream = jp2c.codestream if jp2c is not None else None
+
             self._validate()
 
         self._parse_count += 1
@@ -926,7 +933,14 @@ class Jp2kr(Jp2kBox):
         for k in range(raw_image.contents.numcomps):
             component = raw_image.contents.comps[k]
 
-            self._validate_nonzero_image_size(nrows[k], ncols[k], k)
+            # validate the image size
+            if nrows[k] == 0 or ncols[k] == 0:
+                # Letting this situation continue would segfault openjpeg.
+                msg = (
+                    f"Component {k} has invalid dimensions, "
+                    f"{nrows[k]} x {ncols[k]}"
+                )
+                raise InvalidJp2kError(msg)
 
             addr = ctypes.addressof(component.data.contents)
             with warnings.catch_warnings():
@@ -984,10 +998,6 @@ class Jp2kr(Jp2kBox):
     def get_codestream(self, header_only=True):
         """Retrieve codestream.
 
-        This differs from the codestream property in that segment
-        metadata that lies past the end of the codestream header
-        can be retrieved.
-
         Parameters
         ----------
         header_only : bool, optional
@@ -1023,50 +1033,37 @@ class Jp2kr(Jp2kBox):
 
             # if it's just a raw codestream file, it's easy
             if self._codec_format == opj2.CODEC_J2K:
-                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(">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.
-        """
+                length = self.length
+            else:
 
-        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
+                # 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
+                )
 
-    def _validate_nonzero_image_size(self, nrows, ncols, component_index):
-        """The image cannot have area of zero."""
-        if nrows == 0 or ncols == 0:
-            # Letting this situation continue would segfault openjpeg.
-            msg = (
-                f"Component {component_index} has dimensions "
-                f"{nrows} x {ncols}"
-            )
-            raise InvalidJp2kError(msg)
+                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(">Q", read_buffer)
+                length = box_length - 8
+
+            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

glymur/version.py

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

{glymur-0.14.6.dist-info → glymur-0.14.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Glymur
-Version: 0.14.6
+Version: 0.14.7
 Summary: Read and write JPEG 2000 files
 Author-email: John Evans <jevans667cc@proton.me>
 License-Expression: MIT

{glymur-0.14.6.dist-info → glymur-0.14.7.dist-info}/RECORD

@@ -5,13 +5,13 @@ glymur/codestream.py,sha256=JQUVS8nENdf-rgMDuGwsrg0UakhN_kIShfZEzIV7IT4,62695
 glymur/command_line.py,sha256=3Wngx3wfAvP2PEf4-XRbmm43Bz8zywIL3Gd-6k-wMvY,11485
 glymur/config.py,sha256=lVunNA-A475BX27L_qmrec_lm1InzHuL4_jkG8v_1FA,4140
 glymur/core.py,sha256=O07TfaRW2YmurkFMiurl0DkDSGB0slDAAzP83K1HPFA,3613
-glymur/jp2box.py,sha256=hkhs_rE0yYpgnl4cvt4KXGJzzXfJ_HLBL74TvkZpoN4,113853
-glymur/jp2k.py,sha256=NaFzpuj4Ul4anfu4eZfjR0E1zRdG4ugeUp-nzMxHdQc,56963
-glymur/jp2kr.py,sha256=wlJhQZIRX3x-Fmo2WAFxOaZCu7RThBDFojNWT3Angmw,35399
+glymur/jp2box.py,sha256=5VezBboJI49H40M_1KV_3cu_taxeuEjoNm0YGUQy2D0,113303
+glymur/jp2k.py,sha256=cxdL_QSsSHT2se4qNLsOGIIEw0WmN_8IyVeRUKahNLU,57004
+glymur/jp2kr.py,sha256=OnR38RyKcYVQz78ob3bYpAD2mB-e19kpDxGcT3xRiIc,35398
 glymur/jpeg.py,sha256=PSsyv4ZQTMXGQnpX9Y5-JGxHa0t6QZPZvd5BsnOhahQ,5560
 glymur/options.py,sha256=avZ2ba6yoLWZZ2J8-BI1h0k5Jy1bW0SuRq5guj3yNlo,4372
 glymur/tiff.py,sha256=tLFBuKlMxbMPphAZ-RWLQMWC0lYzB0cJVQmBlGRYpbo,29552
-glymur/version.py,sha256=dsLz3wcVE-F8qfNHrwJJe4_A-PeWXTDddSoyS7efwwo,990
+glymur/version.py,sha256=G19wF2_mAikSgdeBIFXb3wSDtvwXBUng3Ch_VkEw2J4,990
 glymur/data/__init__.py,sha256=n2KZrHV15it7Wu4YCaBLXui1ZleQ30dnZ92dyP6q05k,955
 glymur/data/goodstuff.j2k,sha256=xKQG68KMu33gYjRUDTQvam1Cue2tdio85rNp5J-rYZE,115220
 glymur/data/heliov.jpx,sha256=KXnYdBZgl25jcGLu-m-QfhuP9pqUXV0Hp9HHEdJqr34,1399071
@@ -20,9 +20,9 @@ glymur/lib/__init__.py,sha256=JnM9oPfcZhBDLKo7_yLS-lIRQ1wXb1N9hKKQ-G7vYVk,127
 glymur/lib/_tiff.py,sha256=t8XfgwX2jX0qSU8RuTkNvWLe2390Bp7TiVlr8K2Ku68,51828
 glymur/lib/openjp2.py,sha256=0UWPp2mto8G43yRUhGfpcS1RV6l3ac1YQrlVyBhxvjs,44064
 glymur/lib/tiff.py,sha256=H9hgYh-gBx8LFec4LYReQOpscY51hpK6TIU27-zY8gg,260
-glymur-0.14.6.dist-info/licenses/LICENSE.txt,sha256=G9pvBgkJdPTtZqQmoRyIgAydtic1ZwWtOWBea9VMW7I,1077
-glymur-0.14.6.dist-info/METADATA,sha256=_KCznTi6Xi4MP_Q0ffQ6sZ_w65Kl39lYNv8pjpN1g_M,1325
-glymur-0.14.6.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-glymur-0.14.6.dist-info/entry_points.txt,sha256=v_9O2V_6M5ir6_nYmtkpgY9QvN1H-CMVg6tKqcUN4v0,133
-glymur-0.14.6.dist-info/top_level.txt,sha256=D0SvtBUoPxOs40OTRW3l-kjGFHM6VrXS8yZPK5Fx2wY,7
-glymur-0.14.6.dist-info/RECORD,,
+glymur-0.14.7.dist-info/licenses/LICENSE.txt,sha256=G9pvBgkJdPTtZqQmoRyIgAydtic1ZwWtOWBea9VMW7I,1077
+glymur-0.14.7.dist-info/METADATA,sha256=8Zw_svII010xmqkbpp8eaIb2LGSKdJ5ZeR-W1Fvp5sQ,1325
+glymur-0.14.7.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+glymur-0.14.7.dist-info/entry_points.txt,sha256=v_9O2V_6M5ir6_nYmtkpgY9QvN1H-CMVg6tKqcUN4v0,133
+glymur-0.14.7.dist-info/top_level.txt,sha256=D0SvtBUoPxOs40OTRW3l-kjGFHM6VrXS8yZPK5Fx2wY,7
+glymur-0.14.7.dist-info/RECORD,,