gimp r26024 - in branches/soc-2008-python: . plug-ins/pygimp

[larsc svn gnome org]

Author: larsc
Date: Mon Jun 30 18:04:02 2008
New Revision: 26024
URL: http://svn.gnome.org/viewvc/gimp?rev=26024&view=rev

Log:
2008-08-30  Lars-Peter Clausen  <lars metafoo de>

	* plug-ins/pygimp/tools.py: Fixed typo
	* plug-ins/pygimp/gimpmodule.c: Fixed wrong function and type pointers
	in _PyGimp_Functions.
	* plug-ins/pygimp/pygimp-colors.c:
	* plug-ins/pygimp/pygimp-image.c:
	* plug-ins/pygimp/gimpui.defs:
	Fixed compiler warnings



Modified:
   branches/soc-2008-python/ChangeLog
   branches/soc-2008-python/plug-ins/pygimp/gimpmodule.c
   branches/soc-2008-python/plug-ins/pygimp/gimpui.defs
   branches/soc-2008-python/plug-ins/pygimp/pygimp-colors.c
   branches/soc-2008-python/plug-ins/pygimp/pygimp-image.c
   branches/soc-2008-python/plug-ins/pygimp/tools.py

Modified: branches/soc-2008-python/plug-ins/pygimp/gimpmodule.c
==============================================================================
--- branches/soc-2008-python/plug-ins/pygimp/gimpmodule.c	(original)
+++ branches/soc-2008-python/plug-ins/pygimp/gimpmodule.c	Mon Jun 30 18:04:02 2008
@@ -1775,6 +1775,7 @@
     pygimp_channel_new,
     &PyGimpVectors_Type,
     pygimp_vectors_new,
+    NULL,
     &PyGimpPixelRgn_Type,
     pygimp_pixel_rgn_new
 };

Modified: branches/soc-2008-python/plug-ins/pygimp/gimpui.defs
==============================================================================
--- branches/soc-2008-python/plug-ins/pygimp/gimpui.defs	(original)
+++ branches/soc-2008-python/plug-ins/pygimp/gimpui.defs	Mon Jun 30 18:04:02 2008
@@ -763,15 +763,6 @@
   (return-type "GType")
 )
 
-(define-function gimp_color_display_new
-  (c-name "gimp_color_display_new")
-  (is-constructor-of "GimpColorDisplay")
-  (return-type "GimpColorDisplay*")
-  (parameters
-    '("GType" "display_type")
-  )
-)
-
 (define-method clone
   (of-object "GimpColorDisplay")
   (c-name "gimp_color_display_clone")

Modified: branches/soc-2008-python/plug-ins/pygimp/pygimp-colors.c
==============================================================================
--- branches/soc-2008-python/plug-ins/pygimp/pygimp-colors.c	(original)
+++ branches/soc-2008-python/plug-ins/pygimp/pygimp-colors.c	Mon Jun 30 18:04:02 2008
@@ -68,9 +68,9 @@
 	SET_MEMBER(b);
     }
 
-    if (a)
+    if (a) {
 	SET_MEMBER(a);
-
+    }
 #undef SET_MEMBER
 
     *rgb = tmprgb;
@@ -440,10 +440,10 @@
     return 0;								\
 }
 
-MEMBER_ACCESSOR(r);
-MEMBER_ACCESSOR(g);
-MEMBER_ACCESSOR(b);
-MEMBER_ACCESSOR(a);
+MEMBER_ACCESSOR(r)
+MEMBER_ACCESSOR(g)
+MEMBER_ACCESSOR(b)
+MEMBER_ACCESSOR(a)
 
 #undef MEMBER_ACCESSOR
 
@@ -542,11 +542,11 @@
 static PySequenceMethods rgb_as_sequence = {
     (inquiry)rgb_length,
     (binaryfunc)0,
-    (intargfunc)0,
-    (intargfunc)rgb_getitem,
-    (intintargfunc)rgb_slice,
-    (intobjargproc)rgb_setitem,
-    (intintobjargproc)0,
+    0,
+    rgb_getitem,
+    rgb_slice,
+    rgb_setitem,
+    0,
     (objobjproc)0,
 };
 
@@ -852,9 +852,9 @@
 	SET_MEMBER(v, 100.0);
     }
 
-    if (a)
+    if (a) {
 	SET_MEMBER(a, 255.0);
-
+    }
 #undef SET_MEMBER
 
     *hsv = tmphsv;
@@ -963,10 +963,10 @@
     return 0;								\
 }
 
-MEMBER_ACCESSOR(h, 360.0);
-MEMBER_ACCESSOR(s, 100.0);
-MEMBER_ACCESSOR(v, 100.0);
-MEMBER_ACCESSOR(a, 255.0);
+MEMBER_ACCESSOR(h, 360.0)
+MEMBER_ACCESSOR(s, 100.0)
+MEMBER_ACCESSOR(v, 100.0)
+MEMBER_ACCESSOR(a, 255.0)
 
 #undef MEMBER_ACCESSOR
 
@@ -1065,11 +1065,11 @@
 static PySequenceMethods hsv_as_sequence = {
     (inquiry)hsv_length,
     (binaryfunc)0,
-    (intargfunc)0,
-    (intargfunc)hsv_getitem,
-    (intintargfunc)hsv_slice,
-    (intobjargproc)hsv_setitem,
-    (intintobjargproc)0,
+    0,
+    hsv_getitem,
+    hsv_slice,
+    hsv_setitem,
+    0,
     (objobjproc)0,
 };
 
@@ -1375,9 +1375,9 @@
 	SET_MEMBER(l, 100.0);
     }
 
-    if (a)
+    if (a) {
 	SET_MEMBER(a, 255.0);
-
+    }
 #undef SET_MEMBER
 
     *hsl = tmphsl;
@@ -1476,10 +1476,10 @@
     return 0;								\
 }
 
-MEMBER_ACCESSOR(h, 360.0);
-MEMBER_ACCESSOR(s, 100.0);
-MEMBER_ACCESSOR(l, 100.0);
-MEMBER_ACCESSOR(a, 255.0);
+MEMBER_ACCESSOR(h, 360.0)
+MEMBER_ACCESSOR(s, 100.0)
+MEMBER_ACCESSOR(l, 100.0)
+MEMBER_ACCESSOR(a, 255.0)
 
 #undef MEMBER_ACCESSOR
 
@@ -1578,11 +1578,11 @@
 static PySequenceMethods hsl_as_sequence = {
     (inquiry)hsl_length,
     (binaryfunc)0,
-    (intargfunc)0,
-    (intargfunc)hsl_getitem,
-    (intintargfunc)hsl_slice,
-    (intobjargproc)hsl_setitem,
-    (intintobjargproc)0,
+    0,
+    hsl_getitem,
+    hsl_slice,
+    hsl_setitem,
+    0,
     (objobjproc)0,
 };
 
@@ -1890,9 +1890,9 @@
 	SET_MEMBER(k);
     }
 
-    if (a)
+    if (a) {
 	SET_MEMBER(a);
-
+    }
 #undef SET_MEMBER
 
     *cmyk = tmpcmyk;
@@ -1977,11 +1977,11 @@
     return 0;								\
 }
 
-MEMBER_ACCESSOR(c);
-MEMBER_ACCESSOR(m);
-MEMBER_ACCESSOR(y);
-MEMBER_ACCESSOR(k);
-MEMBER_ACCESSOR(a);
+MEMBER_ACCESSOR(c)
+MEMBER_ACCESSOR(m)
+MEMBER_ACCESSOR(y)
+MEMBER_ACCESSOR(k)
+MEMBER_ACCESSOR(a)
 
 #undef MEMBER_ACCESSOR
 
@@ -2084,11 +2084,11 @@
 static PySequenceMethods cmyk_as_sequence = {
     (inquiry)cmyk_length,
     (binaryfunc)0,
-    (intargfunc)0,
-    (intargfunc)cmyk_getitem,
-    (intintargfunc)cmyk_slice,
-    (intobjargproc)cmyk_setitem,
-    (intintobjargproc)0,
+    0,
+    cmyk_getitem,
+    cmyk_slice,
+    cmyk_setitem,
+    0,
     (objobjproc)0,
 };
 

Modified: branches/soc-2008-python/plug-ins/pygimp/pygimp-image.c
==============================================================================
--- branches/soc-2008-python/plug-ins/pygimp/pygimp-image.c	(original)
+++ branches/soc-2008-python/plug-ins/pygimp/pygimp-image.c	Mon Jun 30 18:04:02 2008
@@ -21,6 +21,10 @@
 #  include <config.h>
 #endif
 
+#ifdef GIMP_DISABLE_DEPRECATED
+#  undef GIMP_DISABLE_DEPRECATED
+#endif
+
 #include "pygimp.h"
 
 static PyObject *

Modified: branches/soc-2008-python/plug-ins/pygimp/tools.py
==============================================================================
--- branches/soc-2008-python/plug-ins/pygimp/tools.py	(original)
+++ branches/soc-2008-python/plug-ins/pygimp/tools.py	Mon Jun 30 18:04:02 2008
@@ -60,7 +60,7 @@
                         len(strokes), strokes)
 
 def convolve(drawable, strokes, pressure = 50,
-             convolve_type = gimp.enums.CONVOLVE_BLUR):
+             convolve_type = gimp.enums.BLUR_CONVOLE):
     if drawable == None:
         drawable = _active_drawable()
     strokes = sum(map(list, strokes), [])