Add support for vips 8.10 (#46)

DIAGNijmegen · Aug 31, 2021 · ec53d75 · ec53d75
1 parent 2b37e85
commit ec53d75
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 6 deletions.
diff --git a/HISTORY.md b/HISTORY.md
@@ -1,5 +1,9 @@
 # History
 
+## 0.4.1 (2021-08-31)
+
+* Added support for vips 8.10
+
 ## 0.4.0 (2021-08-09)
 
 * Removed dependency on `gdcm`

diff --git a/panimg/__init__.py b/panimg/__init__.py
@@ -1,4 +1,4 @@
-__version__ = "0.4.0"
+__version__ = "0.4.1"
 
 import logging
 

diff --git a/panimg/image_builders/tiff.py b/panimg/image_builders/tiff.py
@@ -308,9 +308,16 @@ def _convert_to_tiff(
         str(path.absolute()), access="sequential"
     )
 
-    # correct xres and yres if they have default value of 1
-    # can be removed once updated to VIPS 8.10
-    if image.get("xres") == 1 and "openslide.mpp-x" in image.get_fields():
+    using_old_vips = (
+        pyvips.base.version(0) == 8 and pyvips.base.version(1) < 10
+    )
+    if (
+        using_old_vips
+        and image.get("xres") == 1
+        and "openslide.mpp-x" in image.get_fields()
+    ):
+        # correct xres and yres if they have default value of 1
+        # due to a bug that is resolved in pyvips 8.10
         x_res = 1000.0 / float(image.get("openslide.mpp-x"))
         y_res = 1000.0 / float(image.get("openslide.mpp-y"))
         image = image.copy(xres=x_res, yres=y_res)

diff --git a/pyproject.toml b/pyproject.toml
@@ -31,7 +31,7 @@ commands =
 
 [tool.poetry]
 name = "panimg"
-version = "0.4.0"
+version = "0.4.1"
 description = "Conversion of medical images to MHA and TIFF."
 license = "Apache-2.0"
 authors = ["James Meakin <[email protected]>"]

diff --git a/tests/test_panimg.py b/tests/test_panimg.py
@@ -2,4 +2,4 @@
 
 
 def test_version():
-    assert __version__ == "0.4.0"
+    assert __version__ == "0.4.1"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@


		def test_version():
		assert __version__ == "0.4.0"
		assert __version__ == "0.4.1"