more image done

jcupitt · jcupitt · commit 6af58e4035d1 · 2017-07-31T14:50:06.000+01:00
still needs mutually recursive classes fixing
diff --git a/Vips/__init__.py b/Vips/__init__.py
@@ -22,18 +22,29 @@ def log(msg):
 
 is_PY2 = sys.version_info.major == 2
 
+# GType is an int the size of a pointer ... I don't think we can just use
+# size_t, sadly
+if is_64bits:
+    ffi.cdef('''
+        typedef uint64_t GType;
+    ''')
+else:
+    ffi.cdef('''
+        typedef uint32_t GType;
+    ''')
+
 ffi.cdef('''
     const char* vips_error_buffer (void);
     void vips_error_clear (void);
 
     int vips_init (const char* argv0);
 
     typedef struct _VipsImage VipsImage;
+    typedef struct _GValue GValue;
 
     void* g_malloc(size_t size);
     void g_free(void* data);
 
-
 ''')
 
 def error(msg):
diff --git a/Vips/gobject.py b/Vips/gobject.py
@@ -30,7 +30,7 @@
 
 ''')
 
-class GObject:
+class GObject(object):
 
     def __init__(self, pointer):
         # record the pointer we were given to manage
diff --git a/Vips/gvalue.py b/Vips/gvalue.py
@@ -4,17 +4,6 @@
 
 from Vips import *
 
-# GType is an int the size of a pointer ... I don't think we can just use
-# size_t, sadly
-if is_64bits:
-    ffi.cdef('''
-        typedef uint64_t GType;
-    ''')
-else:
-    ffi.cdef('''
-        typedef uint32_t GType;
-    ''')
-
 ffi.cdef('''
     typedef struct _GValue {
         GType gtype;
@@ -65,7 +54,7 @@
 
 ''')
 
-class GValue:
+class GValue(object):
 
     # look up some common gtypes at init for speed
     gbool_type = gobject_lib.g_type_from_name('gboolean')
@@ -205,10 +194,10 @@ def get(self):
 
             # we want a ref that will last with the life of the vimage: 
             # this ref is matched by the unref that's attached to finalize
-            # by Image.new() 
+            # by Image() 
             gobject_lib.g_object_ref(go)
 
-            result = Image.new(vi)
+            result = Image(vi)
         elif gtype == GValue.array_int_type:
             pint = ffi.new("int *")
 
@@ -232,7 +221,7 @@ def get(self):
                 # this will make a new cdata object 
                 vi = array[i]
 
-                result.append(Image.new(vi))
+                result.append(Image(vi))
         elif gtype == GValue.blob_type:
             psize = ffi.new("size_t *")
 
diff --git a/Vips/image.py b/Vips/image.py
@@ -80,7 +80,7 @@ def imageize(self, value):
 
     def __init__(self, pointer):
         log('Image.__init__: pointer = {0}'.format(pointer))
-        VipsObject.__init__(self, pointer)
+        super(Image, self).__init__(pointer)
 
     @staticmethod
     def new_from_file(vips_filename, **kwargs):
diff --git a/Vips/operation.py b/Vips/operation.py
@@ -23,8 +23,6 @@
     VipsOperation* vips_cache_operation_build (VipsOperation* operation);
     void vips_object_unref_outputs (VipsOperation *operation);
 
-    int vips_object_set_from_string (VipsObject* object, const char* options);
-
 ''')
 
 # values for VipsOperationFlags
@@ -55,7 +53,7 @@ class Operation(VipsObject):
 
     def __init__(self, pointer):
         log('Operation.__init__: pointer = {0}'.format(pointer))
-        VipsObject.__init__(self, pointer)
+        super(Operation, self).__init__(pointer)
 
     def set(self, name, flags, match_image, value):
         # if the object wants an image and we have a constant, imageize it
@@ -76,7 +74,7 @@ def set(self, name, flags, match_image, value):
             # make sure we have a unique copy
             value = value.copy().copy_memory()
 
-        return self.set(name, value)
+        super(Operation, self).set(name, value)
 
     # this is slow ... call as little as possible
     def getargs(self):
@@ -147,7 +145,7 @@ def call(name, *args, **kwargs):
 
         # set any string options before any args so they can't be
         # overridden
-        if vips_lib.vips_object_set_from_string(op.pointer, string_options) != 0:
+        if not op.set_string(string_options):
             error('unable to call {0}\n{1}'.format(name, vips_get_error()))
 
         # set required and optional args
@@ -156,22 +154,16 @@ def call(name, *args, **kwargs):
             if ((flags & INPUT) != 0 and 
                 (flags & REQUIRED) != 0 and 
                 (flags & DEPRECATED) == 0):
-                if not op.set(name, flags, match_image, args[n]):
-                    error('unable to call {0}\n{1]'.
-                        format(name, vips_get_error()))
-
+                op.set(name, flags, match_image, args[n])
                 n += 1
 
         for name, value in kwargs:
-            flags = flags_from_name[name]
-
-            if not op.set(name, flags, match_image, value):
-                error('unable to call {0}\n{1]'.format(name, vips_get_error()))
+            op.set(name, flags_from_name[name], match_image, value)
 
         # build operation
         vop2 = vips_lib.vips_cache_operation_build(op.pointer)
         if vop2 == ffi.NULL:
-            error('unable to call {0}\n{1]'.format(name, vips_get_error()))
+            error('unable to call {0}\n{1}'.format(name, vips_get_error()))
         op2 = Operation(vop2)
         op = op2
         op2 = None
diff --git a/Vips/vobject.py b/Vips/vobject.py
@@ -56,13 +56,15 @@
 
     void vips_object_print_all (void);
 
+    int vips_object_set_from_string (VipsObject* object, const char* options);
+
 ''')
 
 class VipsObject(GObject):
 
     def __init__(self, pointer):
         log('VipsObject.__init__: pointer = {0}'.format(pointer))
-        GObject.__init__(self, pointer)
+        super(VipsObject, self).__init__(pointer)
 
     @staticmethod
     def print_all(msg):
@@ -74,10 +76,11 @@ def print_all(msg):
     def get_typeof(self, name):
         log('VipsObject.get_typeof: self = {0}, name = {1}'.format(self, name))
 
-        pspec = ffi.new("(GParamSpec *)[1]");
-        argument_class = ffi.new("(VipsArgumentClass *)[1]");
-        argument_instance = ffi.new("(VipsArgumentInstance *)[1]");
-        result = vips_lib.vips_object_get_argument(self.gobject, name,
+        pspec = ffi.new("GParamSpec **");
+        argument_class = ffi.new("VipsArgumentClass **");
+        argument_instance = ffi.new("VipsArgumentInstance **");
+        vo = ffi.cast("VipsObject *", self.pointer)
+        result = vips_lib.vips_object_get_argument(vo, name,
             pspec, argument_class, argument_instance)
 
         if result != 0:
@@ -92,16 +95,24 @@ def get(self, name):
 
         gv = GValue()
         gv.init(gtype)
-        gobject_lib.g_object_get_property(self.pointer, name, gv.pointer)
+        go = ffi.cast("GObject *", self.pointer)
+        gobject_lib.g_object_get_property(go, name, gv.pointer)
 
         return gv.get()
 
     def set(self, name, value):
-        log('VipsObject.set: self = {0}, name = {1}, value = {2}'.format(self, name, value))
+        log('VipsObject.set: self = {0}, name = {1}, value = {2}'.
+            format(self, name, value))
 
         gtype = self.get_typeof(name)
 
         gv = GValue()
         gv.init(gtype)
         gv.set(value)
-        gobject_lib.g_object_set_property(self.pointer, name, gv.pointer)
+        go = ffi.cast("GObject *", self.pointer)
+        gobject_lib.g_object_set_property(go, name, gv.pointer)
+
+    # set a series of options using a string, perhaps "fred=12, tile"
+    def set_string(self, string_options):
+        vo = ffi.cast("VipsObject *", self.pointer)
+        return vips_lib.vips_object_set_from_string(vo, string_options) == 0
diff --git a/try1.py b/try1.py
@@ -76,7 +76,7 @@
 print ''
 
 print 'test Image'
-result = Vips.Image.new_from_file('/home/john/pics/k2.jpg')
+result = Vips.Image.new_from_file('/data/john/pics/k2.jpg')
 print 'result =', result
 print ''
 
