Glymur 0.13.3__tar.gz → 0.13.4__tar.gz

{glymur-0.13.3 → glymur-0.13.4}/CHANGES.txt

@@ -1,3 +1,7 @@
+July 4, 2024 - v0.13.4
+    Don't reset openjpeg codec in Jp2k if already set in Jp2kr.
+    Update CI configuration to specify openjpeg versions.
+    
 June 30, 2024 - v0.13.3
     Refactor parsing errors and warnings.
     Update CI configuration for numpy 2.0.

{glymur-0.13.3 → glymur-0.13.4}/Glymur.egg-info/PKG-INFO

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

{glymur-0.13.3 → glymur-0.13.4}/PKG-INFO

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

{glymur-0.13.3 → glymur-0.13.4}/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)
 
@@ -1666,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-0.13.3 → glymur-0.13.4}/glymur/jp2box.py

@@ -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-0.13.3 → glymur-0.13.4}/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()
 

{glymur-0.13.3 → glymur-0.13.4}/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.3"
+version = "0.13.4"
 
 version_tuple = parse(version).release
 

{glymur-0.13.3 → glymur-0.13.4}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = Glymur
-version = 0.13.3
+version = 0.13.4
 author = 'John Evans'
 author_email = "John Evans" <jevans667cc@proton.me>
 license = 'MIT'

{glymur-0.13.3 → glymur-0.13.4}/tests/test_jp2box.py

@@ -20,7 +20,7 @@ import numpy as np
 
 # Local imports ...
 import glymur
-from glymur import Jp2k
+from glymur import Jp2k, Jp2kr
 from glymur.jp2box import (
     ColourSpecificationBox, ContiguousCodestreamBox, FileTypeBox,
     ImageHeaderBox, JP2HeaderBox, JPEG2000SignatureBox, BitsPerComponentBox,
@@ -356,6 +356,16 @@ class TestChannelDefinition(fixtures.TestCommon):
 class TestFileTypeBox(fixtures.TestCommon):
     """Test suite for ftyp box issues."""
 
+    def test_jph(self):
+        """
+        SCENARIO:  JPH box
+
+        EXPECTED RESULT:  The brand is verified.
+        """
+        path = ir.files('tests.data').joinpath('oj-ht-byte.jph')
+        j = Jp2kr(path)
+        self.assertEqual(j.box[1].brand, 'jph ')
+
     def test_bad_brand_on_parse(self):
         """
         SCENARIO:  The JP2 file file type box does not contain a valid brand.

{glymur-0.13.3 → glymur-0.13.4}/tests/test_jp2k.py

@@ -38,6 +38,20 @@ class TestJp2k(fixtures.TestCommon):
         super().setUp()
         glymur.reset_option('all')
 
+    @unittest.skipIf(
+        glymur.version.openjpeg_version < '2.5.0', "Requires as least v2.5.0"
+    )
+    def test_read_htj2k(self):
+        """
+        Scenario:  read an HTJ2K (JPH) file using Jp2k
+
+        Expected response:  The size of the image read is verified.
+        """
+        path = ir.files('tests.data').joinpath('oj-ht-byte.jph')
+        j = Jp2k(path)
+        d = j[:]
+        self.assertEqual(d.shape, (20, 20))
+
     def test_repr(self):
         """
         Scenario:  run repr on Jp2k object

{glymur-0.13.3 → glymur-0.13.4}/tests/test_printing.py

@@ -1607,6 +1607,27 @@ class TestPrinting(fixtures.TestCommon):
         )
         self.assertEqual(actual, expected)
 
+    def test_jph_rsiz(self):
+        """
+        Scenario:  parse a JPH file, print the SIZ segment
+
+        Expected result:  no warnings, the output is verified
+        """
+        path = ir.files('tests.data').joinpath('oj-ht-byte.jph')
+
+        with warnings.catch_warnings():
+            warnings.simplefilter('error')
+            j = Jp2k(path)
+            actual = str(j.codestream.segment[1])
+
+        expected = (
+            ir.files('tests.data')
+              .joinpath('jph_siz.txt')
+              .read_text()
+              .rstrip()
+        )
+        self.assertEqual(actual, expected)
+
 
 class TestJp2dump(fixtures.TestCommon):
     """Tests for verifying how jp2dump console script works."""