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

Bug 751584 - parasite_list() methods fail if no parasites found 

Correct parasite_list() methods.
This commit is contained in:
Jonathan Tait 2015-09-15 02:11:38 +01:00 committed by Michael Natterer
parent e18aae18c2
commit 5b10339c5f
4 changed files with 28 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1313,25 +1313,18 @@ pygimp_parasite_list(PyObject *self)
{
gint num_parasites;
gchar **parasites;
PyObject *ret;
gint i;
parasites = gimp_get_parasite_list (&num_parasites);
if (parasites) {
PyObject *ret;
gint i;
ret = PyTuple_New(num_parasites);
ret = PyTuple_New(num_parasites);
for (i = 0; i < num_parasites; i++)
PyTuple_SetItem(ret, i, PyString_FromString(parasites[i]));
for (i = 0; i < num_parasites; i++) {
PyTuple_SetItem(ret, i, PyString_FromString(parasites[i]));
}
g_strfreev(parasites);
return ret;
}
PyErr_SetString(pygimp_error, "could not list parasites");
return NULL;
g_strfreev(parasites);
return ret;
}
static PyObject *

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

@ -309,25 +309,18 @@ drw_parasite_list(PyGimpDrawable *self)
{
gint num_parasites;
gchar **parasites;
PyObject *ret;
gint i;
parasites = gimp_item_get_parasite_list(self->ID, &num_parasites);
if (parasites) {
PyObject *ret;
gint i;
ret = PyTuple_New(num_parasites);
ret = PyTuple_New(num_parasites);
for (i = 0; i < num_parasites; i++) {
PyTuple_SetItem(ret, i, PyString_FromString(parasites[i]));
}
for (i = 0; i < num_parasites; i++)
PyTuple_SetItem(ret, i, PyString_FromString(parasites[i]));
g_strfreev(parasites);
return ret;
}
PyErr_Format(pygimp_error, "could not list parasites on drawable (ID %d)",
self->ID);
return NULL;
g_strfreev(parasites);
return ret;
}
static PyObject *

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

@ -725,26 +725,18 @@ img_parasite_list(PyGimpImage *self)
{
gint num_parasites;
gchar **parasites;
PyObject *ret;
gint i;
parasites = gimp_image_get_parasite_list (self->ID, &num_parasites);
if (parasites) {
PyObject *ret;
gint i;
ret = PyTuple_New(num_parasites);
ret = PyTuple_New(num_parasites);
for (i = 0; i < num_parasites; i++)
PyTuple_SetItem(ret, i, PyString_FromString(parasites[i]));
for (i = 0; i < num_parasites; i++) {
PyTuple_SetItem(ret, i, PyString_FromString(parasites[i]));
}
g_strfreev(parasites);
return ret;
}
PyErr_Format(pygimp_error, "could not list parasites on image (ID %d)",
self->ID);
return NULL;
g_strfreev(parasites);
return ret;
}
static PyObject *

21
plug-ins/pygimp/pygimp-vectors.c
View File

@ -697,25 +697,18 @@ vectors_parasite_list(PyGimpVectors *self)
{
gint num_parasites;
gchar **parasites;
PyObject *ret;
gint i;
parasites = gimp_item_get_parasite_list(self->ID, &num_parasites);
if (parasites) {
PyObject *ret;
gint i;
ret = PyTuple_New(num_parasites);
ret = PyTuple_New(num_parasites);
for (i = 0; i < num_parasites; i++) {
PyTuple_SetItem(ret, i, PyString_FromString(parasites[i]));
}
for (i = 0; i < num_parasites; i++)
PyTuple_SetItem(ret, i, PyString_FromString(parasites[i]));
g_strfreev(parasites);
return ret;
}
PyErr_Format(pygimp_error, "could not list parasites on vectors (ID %d)",
self->ID);
return NULL;
g_strfreev(parasites);
return ret;
}
static PyMethodDef vectors_methods[] = {