fix install with libvips <= 8.5

only use vips_image_get_fields() on 8.5 and later

thanks rebkwok

see: https://github.com/jcupitt/pyvips/issues/33

CHANGELOG.rst

@@ -1,5 +1,9 @@
 # master 
 
+## Version 2.1.2 (1 March 2018)
+
+* only use get_fields on libvips 8.5+ [rebkwok]
+
 ## Version 2.1.1 (25 February 2018)
 
 * switch to sdist

doc/conf.py

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

pyvips/__init__.py

@@ -73,12 +73,16 @@
 
 if not API_mode:
     import decls
+
     major = vips_lib.vips_version(0)
     minor = vips_lib.vips_version(1)
     features = {
+        # at_least_libvips(8, 5):
+        '8.5+': major > 8 or (major == 8 and minor >= 5),
         # at_least_libvips(8, 6):
-        '8.6+': major > 8 or (major == 8 and minor >= 6)
+        '8.6+': major > 8 or (major == 8 and minor >= 6),
     }
+
     ffi.cdef(decls.cdefs(features))
 
 from .error import *

pyvips/decls.py

@@ -247,7 +247,6 @@ def cdefs(features):
         void vips_image_set (VipsImage* image,
             const char* name, GValue* value);
         int vips_image_remove (VipsImage* image, const char* name);
-        char** vips_image_get_fields (VipsImage* image);
 
         char* vips_filename_get_filename (const char* vips_filename);
         char* vips_filename_get_options (const char* vips_filename);
@@ -294,6 +293,12 @@ def cdefs(features):
 
     '''
 
+    # at_least_libvips(8, 5):
+    if _enabled(features, '8.5+'):
+        code += '''
+            char** vips_image_get_fields (VipsImage* image);
+        '''
+
     # at_least_libvips(8, 6):
     if _enabled(features, '8.6+'):
         code += '''
@@ -308,7 +313,7 @@ def cdefs(features):
     if _enabled(features, 'api'):
         code += '''
             int vips_init (const char* argv0);
-            int vips_version( int flag );
+            int vips_version (int flag);
         '''
 
     return code

pyvips/pyvips_build.py

@@ -20,8 +20,10 @@
 features = {
     # in API mode
     'api': True,
+    # at_least_libvips(8, 5):
+    '8.5+': pkgconfig.installed('vips', '>= 8.5'),
     # at_least_libvips(8, 6):
-    '8.6+': pkgconfig.installed('vips', '>= 8.6')
+    '8.6+': pkgconfig.installed('vips', '>= 8.6'),
 }
 
 import decls

pyvips/version.py

@@ -1,4 +1,4 @@
 # this is execfile()d into setup.py imported into __init__.py
-__version__ = '2.1.1'
+__version__ = '2.1.2'
 
 __all__ = ['__version__']

pyvips/vimage.py

@@ -644,15 +644,17 @@ def get_fields(self):
 
         """
 
-        array = vips_lib.vips_image_get_fields(self.pointer)
         names = []
-        i = 0
-        while array[i] != ffi.NULL:
-            name = _to_string(ffi.string(array[i]))
-            names.append(name)
-            glib_lib.g_free(array[i])
-            i += 1
-        glib_lib.g_free(array)
+
+        if at_least_libvips(8, 5):
+            array = vips_lib.vips_image_get_fields(self.pointer)
+            i = 0
+            while array[i] != ffi.NULL:
+                name = _to_string(ffi.string(array[i]))
+                names.append(name)
+                glib_lib.g_free(array[i])
+                i += 1
+            glib_lib.g_free(array)
 
         return names