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

plug-ins: support the new NULL-terminated object arrays in script-fu.

This commit is contained in:
Jehan 2024-10-22 22:56:34 +02:00
parent e1e2941d9e
commit e97572af98
3 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plug-ins/script-fu/libscriptfu/scheme-marshal-return.c
View File

@ -576,7 +576,7 @@ marshal_returned_PDB_value (scheme *sc,
g_debug ("data '%.*s'", v->size, (gchar *) v->data);
}
}
else if (GIMP_VALUE_HOLDS_OBJECT_ARRAY (value))
else if (GIMP_VALUE_HOLDS_CORE_OBJECT_ARRAY (value))
{
result = marshal_returned_object_array_to_vector (sc, value);
}

35
plug-ins/script-fu/libscriptfu/scheme-marshal.c
View File

@ -79,20 +79,19 @@ marshal_ID_to_item (scheme *sc,
* Requires ID's of instances of GimpItem
*/
pointer
marshal_vector_to_item_array (scheme *sc,
pointer vector,
GValue *value)
marshal_vector_to_item_array (scheme *sc,
pointer vector,
GValue *value)
{
GObject **object_array;
gint id;
pointer error;
GType actual_type = GIMP_TYPE_ITEM;
GObject **object_array;
gint id;
pointer error;
guint num_elements = sc->vptr->vector_length (vector);
g_debug ("vector has %d elements", num_elements);
/* empty vector will produce empty GimpObjectArray */
object_array = g_new0 (GObject*, num_elements);
object_array = g_new0 (GObject *, num_elements + 1);
for (int j = 0; j < num_elements; ++j)
{
@ -114,13 +113,6 @@ marshal_vector_to_item_array (scheme *sc,
g_free (object_array);
return error;
}
/* Parameters are validated based on the actual type in the object array.
* So remember the type here, from the first element.
* Expect all elements are instance of GIMP Item and same type, i.e. homogeneous.
*/
if (j == 0)
actual_type = G_OBJECT_TYPE (object_array[j]);
}
/* Shallow copy.
@ -129,7 +121,7 @@ marshal_vector_to_item_array (scheme *sc,
* !!! Seems like validation checks the contained type of empty arrays,
* and fails if we default to G_TYPE_INVALID but passes if ITEM.
*/
gimp_value_set_object_array (value, actual_type, (GObject**)object_array, num_elements);
g_value_set_boxed (value, (gpointer) object_array);
g_free (object_array);
@ -196,16 +188,15 @@ marshal_path_string_to_gfile (scheme *sc,
* to get the length of the vector.
*/
pointer
marshal_returned_object_array_to_vector (scheme *sc,
GValue *value)
marshal_returned_object_array_to_vector (scheme *sc,
GValue *value)
{
GObject **object_array;
gint32 n;
pointer vector;
object_array = gimp_value_get_object_array (value);
/* array knows own length, ignore length in preceding return value */
n = ((GimpObjectArray*)g_value_get_boxed (value))->length;
object_array = g_value_get_boxed (value);
n = gimp_core_object_array_get_length (object_array);
vector = sc->vptr->mk_vector (sc, n);
@ -455,4 +446,4 @@ marshal_color_array_to_vector (scheme *sc,
}
return result;
}
}

2
plug-ins/script-fu/libscriptfu/scheme-wrapper.c
View File

@ -1343,7 +1343,7 @@ script_fu_marshal_procedure_call (scheme *sc,
g_value_set_boxed (&value, &parasite);
}
}
else if (GIMP_VALUE_HOLDS_OBJECT_ARRAY (&value))
else if (GIMP_VALUE_HOLDS_CORE_OBJECT_ARRAY (&value))
{
/* Now PDB procedures take arrays of Item (Drawable, Vectors, etc.).
* When future PDB procedures take arrays of Image, Display, Resource, etc.