Merge branch 'main' into fsspec

CHANGELOG.md

@@ -10,6 +10,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 - Support for opening files using [fsspec](https://filesystem-spec.readthedocs.io/).
+- Support for decoding HT-JPEG2000 using Pillow, imagecodecs and/or pylibjpeg-openjpeg .
+- Optional codec pyjpegls for JPEG-LS support.
+
+### Fixed
+
+- Handling of non-conformat DICOM Web responses.
 
 ## [0.18.3] - 2024-01-22
 

README.md

@@ -39,6 +39,9 @@ Please note that this is an early release and the API is not frozen yet. Functio
   - JPEGBaseline8Bit
   - JPEG2000
   - JPEG2000Lossless
+  - HTJPEG2000
+  - HTJPEG2000Lossless
+  - HTJPEG2000RPCLLossless
   - ImplicitVRLittleEndian
   - ExplicitVRLittleEndian
   - ExplicitVRBigEndian
@@ -50,9 +53,12 @@ Please note that this is an early release and the API is not frozen yet. Functio
   - JPEGLosslessSV1
   - JPEGLSLossless
   - JPEGLSNearLossless
+  - RLELossless
 
 - With pylibjpeg-rle RLELossless is additionally supported.
 
+- With pyjpegls JPEGLSLossless and JPEGLSNearLossless is additionally supported.
+
 - Optical path identifiers needs to be unique across instances.
 
 - Only one pyramid (i.e. offset from slide corner) per frame of reference is supported.

pyproject.toml

@@ -28,10 +28,14 @@ imagecodecs = { version = "^2024.1.1", optional = true }
 pylibjpeg-rle = { version = "^1.3.0", optional = true }
 fsspec = "^2023.12.2"
 universal-pathlib = "^0.1.4"
+pyjpegls = { version = "^1.2.0", optional = true }
+pylibjpeg-openjpeg = { version = "^2.1.1", optional = true }
 
 [tool.poetry.extras]
 imagecodecs = ["imagecodecs"]
-rle = ["pylibjpeg-rle"]
+pylibjpeg-rle = ["pylibjpeg-rle"]
+pyjpegls = ["pyjpegls"]
+pylibjpeg-openjpeg = ["pylibjpeg-openjpeg"]
 
 [tool.poetry.group.dev.dependencies]
 pytest = "^7.2.0"
@@ -43,6 +47,7 @@ black = "^23.1.0"
 flake8 = "^4.0.1"
 codespell = "^2.2.5"
 wsidicom-data =  "^0.3.0"
+pytest-mock = "^3.12.0"
 
 [build-system]
 requires = ["poetry-core>=1.2.0"]