add get_value()

and set_value(), do auto blob/unblob

TODO

@@ -1,10 +1,5 @@
 - python:
 
-	- image.get() / .set() should autodeblob / blob, just like operation
-	  arguments and returns
-
-	  update a few tests where we use .get(), eg. test_icc()
-
 	- could import like this:
 
 		from gi.repository import Vips 

python/test_colour.py

@@ -221,9 +221,9 @@ class TestColour(unittest.TestCase):
         im3 = im.colourspace(Vips.Interpretation.SRGB)
         self.assertLess(im2.dE76(im3).max(), 6)
 
-        before_profile = test.get("icc-profile-data").get()
+        before_profile = test.get_value("icc-profile-data")
         im = test.icc_transform("images/sRGB.icm")
-        after_profile = im.get("icc-profile-data").get()
+        after_profile = im.get_value("icc-profile-data")
         im2 = test.icc_import()
         im3 = im2.colourspace(Vips.Interpretation.SRGB)
         self.assertLess(im.dE76(im3).max(), 6)
@@ -238,8 +238,5 @@ class TestColour(unittest.TestCase):
         im = test.icc_import()
         self.assertEqual(im.interpretation, Vips.Interpretation.LAB)
 
-
-
-
 if __name__ == '__main__':
     unittest.main()

python/test_convolution.py

@@ -0,0 +1,12 @@
+#!/usr/bin/python
+
+import unittest
+import math
+
+#import logging
+#logging.basicConfig(level = logging.DEBUG)
+
+from gi.repository import Vips 
+from vips8 import vips
+
+

python/vips8/vips.py

@@ -28,6 +28,18 @@ def isunpack(obj):
             return True
     return False
 
+arrayize_types = [[vips_type_array_int, Vips.ArrayInt.new],
+                  [vips_type_array_double, Vips.ArrayDouble.new],
+                  [vips_type_array_image, Vips.ArrayImage.new]]
+def arrayize(gtype, value):
+    for t, cast in arrayize_types:
+        if GObject.type_is_a(gtype, t):
+            if not isinstance(value, list):
+                value = [value]
+            value = cast(value)
+
+    return value
+
 class Error(Exception):
 
     """An error from vips.
@@ -57,22 +69,12 @@ class Argument:
         self.priority = op.get_argument_priority(self.name)
         self.isset = op.argument_isset(self.name)
 
-    def arrayize(self, vips_type_array, vips_cast, value):
-        if GObject.type_is_a(self.prop.value_type, vips_type_array):
-            if not isinstance(value, list):
-                value = [value]
-            value = vips_cast(value)
-
-        return value
-
     def set_value(self, value):
         logging.debug('assigning %s to %s' % (value, self.name))
         logging.debug('%s needs a %s' % (self.name, self.prop.value_type))
 
         # array-ize some types, if necessary
-        value = self.arrayize(vips_type_array_int, Vips.ArrayInt.new, value)
-        value = self.arrayize(vips_type_array_double, Vips.ArrayDouble.new, value)
-        value = self.arrayize(vips_type_array_image, Vips.ArrayImage.new, value)
+        value = arrayize(self.prop.value_type, value)
 
         # blob-ize
         if GObject.type_is_a(self.prop.value_type, vips_type_blob):
@@ -281,10 +283,6 @@ def vips_image_getattr(self, name):
     if name in dir(self.props):
         return getattr(self.props, name)
 
-    # 'format' is a reserved word, annoying, have bandfmt as an alias
-    if name == 'bandfmt':
-        return getattr(self.props, 'format')
-
     return lambda *args, **kwargs: _call_instance(self, name, args, kwargs)
 
 def vips_image_write_to_file(self, vips_filename, **kwargs):
@@ -364,6 +362,34 @@ def vips_rdiv(self, other):
 def vips_floor(self):
     return self.round(Vips.OperationRound.FLOOR)
 
+def vips_get_value(self, field):
+    value = self.get(field)
+
+    logging.debug('read out %s from %s' % (value, self))
+
+    # turn VipsBlobs into strings, VipsArrayDouble into lists etc.
+    # FIXME ... this will involve a copy, we should use
+    # buffer() instead
+    if isunpack(value):
+        value = value.get()
+
+    return value
+
+def vips_set_value(self, field, value):
+    gtype = self.get_typeof(field)
+    logging.debug('assigning %s to %s' % (value, self))
+    logging.debug('%s needs a %s' % (self, gtype))
+
+    # array-ize some types, if necessary
+    value = arrayize(gtype, value)
+
+    # blob-ize
+    if GObject.type_is_a(gtype, vips_type_blob):
+        if not isinstance(value, Vips.Blob):
+            value = Vips.Blob.new(None, value)
+
+    self.set(field, value)
+
 def vips_ceil(self):
     return self.round(Vips.OperationRound.CEIL)
 
@@ -571,6 +597,8 @@ Vips.Image.write_to_buffer = vips_image_write_to_buffer
 # we can use Vips.Image.write_to_memory() directly
 
 # a few useful things
+Vips.Image.get_value = vips_get_value
+Vips.Image.set_value = vips_set_value
 Vips.Image.floor = vips_floor
 Vips.Image.ceil = vips_ceil
 Vips.Image.rint = vips_rint