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

Fixed usage of GimpDrawable 

2008-07-23  Lars-Peter Clausen  <lars@metafoo.de>

	* plug-ins/pygimp/pygimp-drawable.c: Fixed usage of GimpDrawable 


svn path=/branches/soc-2008-python/; revision=26294
This commit is contained in:
Lars-Peter Clausen 2008-07-23 15:40:12 +00:00 committed by Lars-Peter Clausen
parent de085845a0
commit 67426eb82c
2 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2008-07-23 Lars-Peter Clausen <lars@metafoo.de>
* plug-ins/pygimp/pygimp-drawable.c: Fixed usage of GimpDrawable
2008-07-04 Lars-Peter Clausen <lars@metafoo.de>
* plug-ins/pygimp/pygimp-tile.c

36
plug-ins/pygimp/pygimp-drawable.c
View File

@ -31,18 +31,16 @@
#include <glib-object.h>
static void
/*static void
ensure_drawable(PyGimpDrawable *self)
{
if (!self->drawable)
self->drawable = gimp_drawable_get(self->ID);
}
}*/
static PyObject *
drw_flush(PyGimpDrawable *self)
{
ensure_drawable(self);
gimp_drawable_flush(self->drawable);
Py_INCREF(Py_None);
@ -129,8 +127,6 @@ drw_get_tile(PyGimpDrawable *self, PyObject *args, PyObject *kwargs)
&shadow, &row, &col))
return NULL;
ensure_drawable(self);
t = gimp_drawable_get_tile(self->drawable, shadow, row, col);
return pygimp_tile_new(t, self);
}
@ -147,8 +143,6 @@ drw_get_tile2(PyGimpDrawable *self, PyObject *args, PyObject *kwargs)
&shadow, &x ,&y))
return NULL;
ensure_drawable(self);
t = gimp_drawable_get_tile2(self->drawable, shadow, x, y);
return pygimp_tile_new(t, self);
}
@ -166,8 +160,6 @@ drw_get_pixel_rgn(PyGimpDrawable *self, PyObject *args, PyObject *kwargs)
&x, &y, &width, &height, &dirty, &shadow))
return NULL;
ensure_drawable(self);
return pygimp_pixel_rgn_new(self, x, y, width, height, dirty, shadow);
}
@ -578,7 +570,7 @@ drw_transform_rotate(PyGimpDrawable *self, PyObject *args, PyObject *kwargs)
"clip_result", NULL };
if (!PyArg_ParseTupleAndKeywords(args, kwargs,
"diiii|iii:transform_rotate", kwlist,
"diiiii|iii:transform_rotate", kwlist,
&angle, &auto_center, &center_x, &center_y,
&transform_direction, &interpolation,
&supersample, &recursion_level,
@ -1200,29 +1192,36 @@ PyTypeObject PyGimpDrawable_Type = {
PyObject *
pygimp_drawable_new(GimpDrawable *drawable, gint32 ID)
{
PyObject *self;
PyObject *self = NULL;
if (drawable != NULL)
ID = drawable->drawable_id;
if (!gimp_drawable_is_valid(ID)) {
if (drawable)
gimp_drawable_detach(drawable);
Py_INCREF(Py_None);
return Py_None;
}
/* create the appropriate object type */
if (gimp_drawable_is_layer(ID))
self = pygimp_layer_new(ID);
else
self = pygimp_channel_new(ID);
self = (PyObject*)PyObject_NEW(PyGimpLayer, &PyGimpLayer_Type);
else if (gimp_drawable_is_channel(ID))
self = (PyObject*)PyObject_NEW(PyGimpChannel, &PyGimpChannel_Type);
if (self == NULL)
if (self == NULL) {
if (drawable)
gimp_drawable_detach(drawable);
return NULL;
}
((PyGimpDrawable*)self)->ID = ID;
if (drawable)
((PyGimpDrawable*)self)->drawable = drawable;
else if(((PyGimpDrawable*)self)->drawable == NULL)
((PyGimpDrawable*)self)->drawable = gimp_drawable_get(((PyGimpDrawable*)self)->ID);
else
((PyGimpDrawable*)self)->drawable = gimp_drawable_get(ID);
return self;
}
@ -1789,6 +1788,7 @@ pygimp_layer_new(gint32 ID)
self->ID = ID;
self->drawable = gimp_drawable_get(ID);
return (PyObject *)self;
}