fix issues in 3.1.0

- fix get_gainmap arguments [jcupitt] - fix __array__ copy argument [jcupitt] - add a test [jcupitt]

Author: jcupitt

CHANGELOG.rst

@@ -1,3 +1,9 @@
+## Version 3.1.1 (released 9 December 2025)
+
+- fix get_gainmap arguments [jcupitt]
+- fix __array__ copy argument test [jcupitt]
+- add a test [jcupitt]
+
 ## Version 3.1.0 (released 8 December 2025)
 
 - fix glib DLL name with Conan [boussaffawalid]

doc/conf.py

@@ -66,7 +66,7 @@
 # The short X.Y version.
 version = u'3.1'
 # The full version, including alpha/beta/rc tags.
-release = u'3.1.0'
+release = u'3.1.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

pyvips/version.py

@@ -1,4 +1,4 @@
 # this is used in pyproject.toml and imported into __init__.py
-__version__ = '3.1.0'
+__version__ = '3.1.1'
 
 __all__ = ['__version__']

pyvips/vimage.py

@@ -982,7 +982,7 @@ def set_kill(self, kill):
 
  # get/set metadata
 
- def get_gainmap(self, name):
+ def get_gainmap(self):
  """Get the image gainmap, if any.
 
  Get the gainmap associated with this image, or None for no gainmap.
@@ -1234,7 +1234,7 @@ def __array__(self, dtype=None, copy=None):
  import numpy as np
 
  # we always generate a new image, so if copy is False, we can't work
- if not copy:
+ if copy is False:
  raise ValueError
 
  arr = (

tests/helpers/helpers.py

@@ -10,6 +10,7 @@
 JPEG_FILE = os.path.join(IMAGES, "sample.jpg")
 WEBP_FILE = os.path.join(IMAGES, "sample.webp")
 SVG_FILE = os.path.join(IMAGES, "logo.svg")
+UHDR_FILE = os.path.join(IMAGES, "ultra-hdr.jpg")
 
 
 # an expanding zip ... if either of the args is a scalar or a one-element list,

tests/images/ultra-hdr.jpg

@@ -2,7 +2,7 @@
 
 import pyvips
 import pytest
-from helpers import JPEG_FILE
+from helpers import JPEG_FILE, UHDR_FILE, skip_if_no
 
 
 class TestImage:
@@ -393,3 +393,26 @@ def test_from_PIL(self):
  assert im.height == pim.height
  assert im.min() == 0
  assert im.max() == 0
+
+ @skip_if_no('uhdrload')
+ @pytest.mark.skipif(not pyvips.at_least_libvips(8, 18),
+ reason="requires libvips >= 8.18")
+ def test_gainmap(self):
+ def crop_gainmap(image):
+ gainmap = image.get_gainmap()
+
+ if gainmap:
+ new_gainmap = gainmap.crop(0, 0, 10, 10)
+ image = image.copy()
+ image.set_type(pyvips.GValue.image_type,
+ "gainmap", new_gainmap)
+
+ return image
+
+ image = pyvips.Image.new_from_file(UHDR_FILE)
+ image = crop_gainmap(image)
+ buf = image.write_to_buffer(".jpg")
+ new_image = pyvips.Image.new_from_buffer(buf, "")
+ new_gainmap = new_image.get_gainmap()
+
+ assert new_gainmap.width == 10