Glymur 0.14.1.post1__py3-none-any.whl → 0.14.4__py3-none-any.whl

glymur/_core_converter.py

@@ -9,7 +9,7 @@ from uuid import UUID
 
 # local imports
 from . import jp2box
-from .lib.tiff import DATATYPE2FMT
+from .lib._tiff import DATATYPE2FMT
 from .jp2k import Jp2k
 from glymur.core import RESTRICTED_ICC_PROFILE
 

glymur/jp2box.py

@@ -51,7 +51,7 @@ from .core import (
     ANY_ICC_PROFILE,
     VENDOR_COLOR_METHOD,
 )
-from .lib.tiff import tiff_header, BadTiffTagDatatype
+from .lib._tiff import tiff_header, BadTiffTagDatatype
 from . import get_option
 from ._iccprofile import _ICCProfile
 

glymur/jp2k.py

@@ -216,7 +216,7 @@ class Jp2k(Jp2kr):
         force : bool
             If true, then run finalize operations
         """
-        self.parse(force=force_parse)
+        self._parse(force=force_parse)
 
         if (
             self._capture_resolution is None
@@ -256,7 +256,7 @@ class Jp2k(Jp2kr):
         temp_filename = self.filename + ".tmp"
         self.wrap(temp_filename, boxes=self.box)
         shutil.move(temp_filename, self.filename)
-        self.parse(force=True)
+        self._parse(force=True)
 
     def _validate_kwargs(self):
         """Validate keyword parameters passed to the constructor."""
@@ -526,10 +526,10 @@ class Jp2k(Jp2kr):
         This method can only be used to create JPEG 2000 images that can fit
         in memory.
         """
-        if version.openjpeg_version < "2.3.0":
+        if version.openjpeg_version < "2.4.0":
             msg = (
-                "You must have at least version 2.3.0 of OpenJPEG in order to "
-                "write images."
+                "The minimum supported version of OpenJPEG is 2.4.0.  "
+                f"Your version is {version.openjpeg_version}."
             )
             raise RuntimeError(msg)
 
@@ -817,7 +817,7 @@ class Jp2k(Jp2kr):
         with self.path.open("ab") as ofile:
             box.write(ofile)
 
-        self.parse(force=True)
+        self._parse(force=True)
 
     def wrap(self, filename, boxes=None):
         """
@@ -1463,10 +1463,10 @@ class _TileWriter(object):
         """Write image data to a JP2/JPX/J2k file.  Intended usage of the
         various parameters follows that of OpenJPEG's opj_compress utility.
         """
-        if version.openjpeg_version < "2.3.0":
+        if version.openjpeg_version < "2.4.0":
             msg = (
-                "You must have at least version 2.3.0 of OpenJPEG "
-                "in order to write images."
+                "The minimum supported version of OpenJPEG is 2.4.0.  "
+                f"Your version is {version.openjpeg_version}."
             )
             raise RuntimeError(msg)
 

glymur/jp2kr.py

@@ -12,7 +12,6 @@ from __future__ import annotations
 from contextlib import ExitStack
 import ctypes
 import pathlib
-import re
 import struct
 import sys
 import warnings
@@ -107,7 +106,7 @@ class Jp2kr(Jp2kBox):
         if not self.path.exists():
             raise FileNotFoundError(f"{self.filename} does not exist.")
 
-        self.parse()
+        self._parse()
         self._initialize_shape()
 
     def _initialize_shape(self):
@@ -393,6 +392,15 @@ class Jp2kr(Jp2kBox):
         return "\n".join(metadata)
 
     def parse(self, force=False):
+        """
+        .. deprecated:: 0.15.0
+        """
+        breakpoint()
+        msg = "Deprecated, do not use."
+        warnings.warn(msg, DeprecationWarning)
+        self._parse(force=force)
+
+    def _parse(self, force=False):
         """Parses the JPEG 2000 file.
 
         Parameters
@@ -633,25 +641,6 @@ class Jp2kr(Jp2kBox):
         # Ok, 3 arguments in pargs.
         return data[:, :, bands]
 
-    def read(self, **kwargs):
-        """Read a JPEG 2000 image.
-
-        .. deprecated:: 0.13.5
-           Use numpy-style slicing instead.
-
-        Returns
-        -------
-        img_array : ndarray
-            The image data.
-        """
-
-        if "ignore_pclr_cmap_cdef" in kwargs:
-            self.ignore_pclr_cmap_cdef = kwargs["ignore_pclr_cmap_cdef"]
-            kwargs.pop("ignore_pclr_cmap_cdef")
-        warnings.warn("Use array-style slicing instead.", DeprecationWarning)
-        img = self._read(**kwargs)
-        return img
-
     def _subsampling_sanity_check(self):
         """Check for differing subsample factors."""
         if self._decoded_components is None:
@@ -704,11 +693,10 @@ class Jp2kr(Jp2kBox):
         RuntimeError
             If the image has differing subsample factors.
         """
-        if re.match("0|1|2.[012]", version.openjpeg_version):
+        if version.openjpeg_version < '2.4.0':
             msg = (
-                f"You must have a version of OpenJPEG at least as high as "
-                f"2.3.0 before you can read JPEG2000 images with glymur.  "
-                f"Your version is {version.openjpeg_version}"
+                "The minimum supported version of OpenJPEG is 2.4.0.  "
+                f"Your version is {version.openjpeg_version}."
             )
             raise RuntimeError(msg)
 
@@ -854,7 +842,7 @@ class Jp2kr(Jp2kBox):
 
         The only time you should ever use this method is when the image has
         different subsampling factors across components.  Otherwise you should
-        use the read method.
+        use numpy-style slicing.
 
         Parameters
         ----------
@@ -888,11 +876,10 @@ class Jp2kr(Jp2kBox):
         >>> jp = glymur.Jp2k(jfile)
         >>> components_lst = jp.read_bands(rlevel=1)
         """
-        if version.openjpeg_version < "2.3.0":
+        if version.openjpeg_version < "2.4.0":
             msg = (
-                f"You must have at least version 2.3.0 of OpenJPEG installed "
-                f"before using this method.  Your version of OpenJPEG is "
-                f"{version.openjpeg_version}."
+                "The minimum supported version of OpenJPEG is 2.4.0.  "
+                f"Your version is {version.openjpeg_version}."
             )
             raise RuntimeError(msg)
 
@@ -966,7 +953,7 @@ class Jp2kr(Jp2kBox):
         return image
 
     def _component2dtype(self, component):
-        """Determin the appropriate numpy datatype for an OpenJPEG component.
+        """Determine the appropriate numpy datatype for an OpenJPEG component.
 
         Parameters
         ----------