start adding enums

jcupitt · jcupitt · commit 37f284d60774 · 2017-08-01T13:24:02.000+01:00
test_arithmetic.py runs now, but fails on every test heh

need getattr on the Image class
diff --git a/pyvips/__init__.py b/pyvips/__init__.py
@@ -1,14 +1,16 @@
 # wrapper for libvips
 
 # Our classes need to refer to each other ... make them go via this
-# package-level global which we update at the end with the real classes
+# package-level global which we update at the end with references to the real
+# classes
 package_index = {
     'Image': 'banana',
     'Operation': 'apple',
     'GValue': 'kumquat'
 }
 
 from base import *
+from enums import *
 from gvalue import GValue
 from gobject import GObject
 from vobject import VipsObject
diff --git a/pyvips/base.py b/pyvips/base.py
@@ -42,8 +42,10 @@
     typedef struct _VipsImage VipsImage;
     typedef struct _GValue GValue;
 
-    void* g_malloc(size_t size);
-    void g_free(void* data);
+    void* g_malloc (size_t size);
+    void g_free (void* data);
+
+    int vips_leak_set (int leak);
 
 ''')
 
@@ -76,4 +78,8 @@ def __str__(self):
 def g_free_callback(ptr):
     gobject_lib.g_free(ptr)
 
-__all__ = ['ffi', 'g_free_callback', 'vips_lib', 'gobject_lib', 'Error']
+def leak_set(leak):
+    return vips_lib.vips_leak_set(leak)
+
+__all__ = ['ffi', 'g_free_callback', 'vips_lib', 'gobject_lib', 'Error',
+           'leak_set']
diff --git a/pyvips/enums.py b/pyvips/enums.py
@@ -0,0 +1,25 @@
+# enums
+
+from __future__ import division
+
+import logging
+
+logger = logging.getLogger(__name__)
+
+# you can supply enum values as strings or ints ... these classes give the ints
+# for each string, so pyvips.BandFormat.SHORT is equivalent to "short"
+
+class BandFormat(object):
+    UCHAR = 0
+    CHAR = 1
+    USHORT = 2
+    SHORT = 3
+    UINT = 4
+    INT = 5
+    FLOAT = 6
+    COMPLEX = 7
+    DOUBLE = 8
+    DPCOMPLEX = 9
+
+    def __eq__(self, other):
+        print 'BANANA !!!'
