dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed typo Fixed wrong function and type pointers in _PyGimp_Functions. 

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


svn path=/branches/soc-2008-python/; revision=26024
This commit is contained in:
Lars-Peter Clausen 2008-06-30 18:04:02 +00:00 committed by Lars-Peter Clausen
parent 4fc6e4b270
commit bccac74ec1
6 changed files with 62 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,4 +1,14 @@
2008-08-16 Lars-Peter Clausen <lars@metafoo.de>
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
2008-08-28 Lars-Peter Clausen <lars@metafoo.de>
* plug-ins/pygimp/pygimp-pdb.c: Fix typo
* plug-ins/pygimp/__init__.py: pixel propertys now return a tuple of

1
plug-ins/pygimp/gimpmodule.c
View File

@ -1775,6 +1775,7 @@ static struct _PyGimp_Functions pygimp_api_functions = {
pygimp_channel_new,
&PyGimpVectors_Type,
pygimp_vectors_new,
NULL,
&PyGimpPixelRgn_Type,
pygimp_pixel_rgn_new
};

9
plug-ins/pygimp/gimpui.defs
View File

@ -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")

90
plug-ins/pygimp/pygimp-colors.c
View File

@ -68,9 +68,9 @@ rgb_set(PyObject *self, PyObject *args, PyObject *kwargs)
SET_MEMBER(b);
}
if (a)
if (a) {
SET_MEMBER(a);
}
#undef SET_MEMBER
*rgb = tmprgb;
@ -440,10 +440,10 @@ rgb_set_ ## m(PyObject *self, PyObject *value, void *closure) \
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 @@ rgb_slice(PyObject *self, int start, int end)
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 @@ hsv_set(PyObject *self, PyObject *args, PyObject *kwargs)
SET_MEMBER(v, 100.0);
}
if (a)
if (a) {
SET_MEMBER(a, 255.0);
}
#undef SET_MEMBER
*hsv = tmphsv;
@ -963,10 +963,10 @@ hsv_set_ ## m(PyObject *self, PyObject *value, void *closure) \
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 @@ hsv_slice(PyObject *self, int start, int end)
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 @@ hsl_set(PyObject *self, PyObject *args, PyObject *kwargs)
SET_MEMBER(l, 100.0);
}
if (a)
if (a) {
SET_MEMBER(a, 255.0);
}
#undef SET_MEMBER
*hsl = tmphsl;
@ -1476,10 +1476,10 @@ hsl_set_ ## m(PyObject *self, PyObject *value, void *closure) \
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 @@ hsl_slice(PyObject *self, int start, int end)
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 @@ cmyk_set(PyObject *self, PyObject *args, PyObject *kwargs)
SET_MEMBER(k);
}
if (a)
if (a) {
SET_MEMBER(a);
}
#undef SET_MEMBER
*cmyk = tmpcmyk;
@ -1977,11 +1977,11 @@ cmyk_set_ ## m(PyObject *self, PyObject *value, void *closure) \
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 @@ cmyk_slice(PyObject *self, int start, int end)
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,
};

4
plug-ins/pygimp/pygimp-image.c
View File

@ -21,6 +21,10 @@
# include <config.h>
#endif
#ifdef GIMP_DISABLE_DEPRECATED
# undef GIMP_DISABLE_DEPRECATED
#endif
#include "pygimp.h"
static PyObject *

2
plug-ins/pygimp/tools.py
View File

@ -60,7 +60,7 @@ def clone(drawable, strokes, src_drawable = None, src_x = 0, src_y = 0,
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), [])