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

libgimp: allowing NULL passed as value to a GimpObjectArray PDB argument. 

A NULL will be transformed into an array of size 0.
This commit is contained in:
Jehan 2023-10-19 23:34:47 +02:00
parent 8ca6f1ac5b
commit c3e59b071f
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libgimp/gimpgpparams-body.c
View File

@ -553,6 +553,7 @@ static void
gimp_gp_param_to_value (gpointer gimp, gimp_gp_param_to_value (gpointer gimp,
const GPParam *param, const GPParam *param,
GType type, GType type,
GParamSpec *pspec,
GValue *value) GValue *value)
{ {
g_return_if_fail (param != NULL); g_return_if_fail (param != NULL);
@ -652,7 +653,15 @@ gimp_gp_param_to_value (gpointer gimp,
GObject **objects; GObject **objects;
gint i; gint i;
object_type = g_type_from_name (param->data.d_id_array.type_name); if (param->data.d_id_array.type_name == NULL)
{
g_return_if_fail (param->data.d_id_array.size == 0 && pspec != NULL);
object_type = GIMP_PARAM_SPEC_OBJECT_ARRAY (pspec)->object_type;
}
else
{
object_type = g_type_from_name (param->data.d_id_array.type_name);
}
objects = g_new (GObject *, param->data.d_id_array.size); objects = g_new (GObject *, param->data.d_id_array.size);
@ -732,8 +741,9 @@ _gimp_gp_params_to_value_array (gpointer gimp,
for (i = 0; i < n_params; i++) for (i = 0; i < n_params; i++)
{ {
GValue value = G_VALUE_INIT; GParamSpec *pspec = NULL;
GType type; GValue value = G_VALUE_INIT;
GType type;
/* first get the GType from the passed GPParam */ /* first get the GType from the passed GPParam */
type = g_type_from_name (params[i].type_name); type = g_type_from_name (params[i].type_name);
@ -754,6 +764,8 @@ _gimp_gp_params_to_value_array (gpointer gimp,
{ {
GType pspec_type = G_PARAM_SPEC_VALUE_TYPE (pspecs[pspec_index]); GType pspec_type = G_PARAM_SPEC_VALUE_TYPE (pspecs[pspec_index]);
pspec = pspecs[pspec_index];
if (type != pspec_type) if (type != pspec_type)
{ {
if (g_type_is_a (pspec_type, type)) if (g_type_is_a (pspec_type, type))
@ -786,7 +798,7 @@ _gimp_gp_params_to_value_array (gpointer gimp,
} }
} }
gimp_gp_param_to_value (gimp, &params[i], type, &value); gimp_gp_param_to_value (gimp, &params[i], type, pspec, &value);
gimp_value_array_append (args, &value); gimp_value_array_append (args, &value);
g_value_unset (&value); g_value_unset (&value);