Glymur 0.13.5__tar.gz → 0.13.6__tar.gz

{glymur-0.13.5 → glymur-0.13.6}/CHANGES.txt

@@ -1,3 +1,6 @@
+Aug 19, 2024 - v0.13.6
+    Fix tiff2jp2 when tile coverage not square.
+
 July 26, 2024 - v0.13.5
     Add support for parsing the CAP segment.
     End official support for OpenJPEG 2.3.x.

{glymur-0.13.5 → glymur-0.13.6}/Glymur.egg-info/PKG-INFO

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

{glymur-0.13.5 → glymur-0.13.6}/PKG-INFO

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

{glymur-0.13.5 → glymur-0.13.6}/glymur/tiff.py

@@ -862,7 +862,7 @@ class Tiff2Jp2k(object):
         partial_jp2_tile_rows = (self.imageheight / jth) != (self.imageheight // jth)  # noqa : E501
         partial_jp2_tile_cols = (self.imagewidth / jtw) != (self.imagewidth // jtw)  # noqa : E501
 
-        num_jp2k_tile_rows = int(np.ceil(self.imagewidth / jtw))
+        num_jp2k_tile_rows = int(np.ceil(self.imageheight / jth))
         num_jp2k_tile_cols = int(np.ceil(self.imagewidth / jtw))
 
         jp2k_tile_row = int(np.ceil(jp2k_tile_num // num_jp2k_tile_cols))

{glymur-0.13.5 → glymur-0.13.6}/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.5"
+version = "0.13.6"
 
 version_tuple = parse(version).release
 

{glymur-0.13.5 → glymur-0.13.6}/setup.cfg

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

{glymur-0.13.5 → glymur-0.13.6}/tests/test_tiff2jp2.py

@@ -43,6 +43,7 @@ class TestSuite(fixtures.TestCommon):
         cls.ycbcr_bg = root.joinpath('ycbcr_bg.tif')
         cls.ycbcr_stripped = root.joinpath('ycbcr_stripped.tif')
         cls.stripped = root.joinpath('stripped.tif')
+        cls.moon63 = root.joinpath('moon63.tif')
 
         test_tiff_dir = tempfile.mkdtemp()
         cls.test_tiff_path = pathlib.Path(test_tiff_dir)
@@ -1919,3 +1920,26 @@ class TestSuite(fixtures.TestCommon):
         expected = expected[:, :, :3]
 
         np.testing.assert_array_equal(actual, expected)
+
+    def test_unevenly_tiled(self):
+        """
+        SCENARIO:  Convert monochromatic TIFF file to JP2.  The TIFF is tiled
+        2x3, and the 2nd row of tiles consists of partial tiles.
+
+        EXPECTED RESULT:  The JP2 file validates
+        """
+        with Tiff2Jp2k(
+            self.moon63, self.temp_jp2_filename, tilesize=(32, 32)
+        ) as j:
+            j.run()
+
+        jp2 = Jp2k(self.temp_jp2_filename)
+        actual = jp2[:]
+        expected = skimage.io.imread(self.moon63)
+        np.testing.assert_array_equal(actual, expected)
+
+        c = jp2.get_codestream()
+        self.assertEqual(c.segment[1].xsiz, 96)
+        self.assertEqual(c.segment[1].ysiz, 63)
+        self.assertEqual(c.segment[1].xtsiz, 32)
+        self.assertEqual(c.segment[1].ytsiz, 32)