wim/tiffwrite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- python compression parsing fix

Browse Source
This commit is contained in:
Wim Pomp
2025-03-27 20:57:03 +01:00
parent 12d5d3355b
commit f4ee691cdb
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@@ -1,6 +1,6 @@
[package] [package]
name = "tiffwrite" name = "tiffwrite"
version = "2025.3.0" version = "2025.3.1"
edition = "2021" edition = "2021"
authors = ["Wim Pomp <w.pomp@nki.nl>"] authors = ["Wim Pomp <w.pomp@nki.nl>"]
license = "MIT" license = "MIT"

13
py/tiffwrite/__init__.py
View File

@@ -61,14 +61,21 @@ class IJTiffFile(rs.IJTiffFile):
deltaz: float = None, timeinterval: float = None, deltaz: float = None, timeinterval: float = None,
compression: int | str | tuple[int, int] | tuple[str, int] = None, comment: str = None, compression: int | str | tuple[int, int] | tuple[str, int] = None, comment: str = None,
extratags: Sequence[Tag] = None) -> None: extratags: Sequence[Tag] = None) -> None:
codecs = {'z': 50000, 'd': 8, 8: 8, 50000: 50000}
def get_codec(idx: int | str):
codecs = {'z': 50000, 'd': 8, 8: 8, 50000: 50000}
if isinstance(idx, str):
return codecs.get(idx[0].lower(), 50000)
else:
return codecs.get(int(idx), 50000)
self.path = Path(path) self.path = Path(path)
self.dtype = np.dtype(dtype) self.dtype = np.dtype(dtype)
if compression is not None: if compression is not None:
if isinstance(compression, tuple): if isinstance(compression, tuple):
compression = codecs.get(compression[0], 50000), (int(compression[1]) if len(compression) == 2 else 22) compression = get_codec(compression[0]), (int(compression[1]) if len(compression) > 1 else 22)
else: else:
compression = codecs.get(compression, 50000), 22 compression = get_codec(compression), 22
self.set_compression(*compression) self.set_compression(*compression)
if colors is not None: if colors is not None:
self.colors = np.array([get_color(color) for color in colors]) self.colors = np.array([get_color(color) for color in colors])