Fix for Turbo jpeg 3

CHANGELOG.md

@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased] -
 
+## [0.11.1] - 2023-12-06
+
+### Fixed
+
+- Missing jpeg headers when using TurboJpeg 3.
+- Check for either `libturbojpeg.dll` or `turbojpeg.dll`.
+
 ## [0.11.0] - 2023-12-06
 
 ### Changed

opentile/__init__.py

@@ -17,4 +17,4 @@
 from opentile.opentile import OpenTile
 from opentile.metadata import Metadata
 
-__version__ = "0.11.0"
+__version__ = "0.11.1"

opentile/jpeg/turbojpeg_patch.py

@@ -58,13 +58,15 @@ def find_turbojpeg_path() -> Optional[Path]:
         return Path(turbojpeg_lib_path)
     turbojpeg_lib_dir = os.environ.get("TURBOJPEG")
     if turbojpeg_lib_dir is not None:
-        turbojpeg_lib_path = Path(turbojpeg_lib_dir).joinpath("turbojpeg.dll")
-        if turbojpeg_lib_path.exists():
-            return turbojpeg_lib_path
+        dll_names = ("libturbojpeg.dll", "turbojpeg.dll")
+        for dll_name in dll_names:
+            turbojpeg_lib_path = Path(turbojpeg_lib_dir).joinpath(dll_name)
+            if turbojpeg_lib_path.exists():
+                return turbojpeg_lib_path
     raise ModuleNotFoundError(
-        "Could not find turbojpeg.dll in the directories specified "
+        "Could not find libturbojpeg.dll or turbojpeg.dll in the directories specified "
         "in the `Path` or `TURBOJPEG` environmental variable. Please add the "
-        "directory with turbojpeg.dll to the `Path` or `TURBOJPEG` "
+        "directory with libturbojpeg.dll or turbojpeg.dll to the `Path` or `TURBOJPEG` "
         "environmental variable."
     )
 

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "opentile"
-version = "0.11.0"
+version = "0.11.1"
 description = "Read tiles from wsi-TIFF files"
 authors = ["Erik O Gabrielsson <erik.o.gabrielsson@sectra.com>"]
 license = "Apache-2.0"
@@ -18,7 +18,7 @@ classifiers = [
 python = "^3.9"
 tifffile = ">=2022.5.4"
 numpy = "^1.22.0"
-PyTurboJPEG = "^1.6.1"
+PyTurboJPEG = "^1.7.3"
 Pillow = "^10.1.0"
 imagecodecs = ">=2022.12.24"
 defusedxml = "^0.7.1"