procyberian/gimp
2
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp.git synced 2025-07-03 17:33:25 +00:00
Code Issues 1 Projects 1 Releases Packages Wiki Activity Actions

libgimp*, pdb: gimp_value_array_new_from_types*() takes (type, value)

Browse source 
So a value array can now we created like this:

array = gimp_value_array_new_from_types (&error_msg,
                                         G_TYPE_STRING, "foo",
                                         G_TYPE_INT,    23,
                                         G_TYPE_NONE);

Change PDB generation to use this, which makes for much nicer code in
the libgimp wrappers, and only set arrays separately instead of all
values.
This commit is contained in:
Michael Natterer 2019-08-08 13:01:50 +02:00
parent dd8bf71f96
commit 30d63111c3
54 changed files with 2030 additions and 2508 deletions
Download patch file Download diff file Expand all files Collapse all files

50
libgimpbase/gimpvaluearray.c
View file

@ -23,6 +23,7 @@
#include <string.h>
#include <glib-object.h>
#include <gobject/gvaluecollector.h>
#include "gimpbasetypes.h"
@ -147,18 +148,22 @@ gimp_value_array_new (gint n_prealloced)
/**
* gimp_value_array_new_from_types:
* @error_msg: return location for an error message.
* @first_type: first type in the array, or #G_TYPE_NONE.
* @...: the remaining types in the array, terminated by #G_TYPE_NONE
*
* Allocate and initialize a new #GimpValueArray, and fill it with
* values that are initialized to the types passed.
* values that are given as a list of (#GType, value) pairs,
* terminated by #G_TYPE_NONE.
*
* Returns: a newly allocated #GimpValueArray
* Returns: (nullable): a newly allocated #GimpValueArray, or %NULL if
* an error happened.
*
* Since: 3.0
*/
GimpValueArray *
gimp_value_array_new_from_types (GType first_type,
gimp_value_array_new_from_types (gchar **error_msg,
GType first_type,
...)
{
GimpValueArray *value_array;
@ -166,7 +171,8 @@ gimp_value_array_new_from_types (GType first_type,
va_start (va_args, first_type);
value_array = gimp_value_array_new_from_types_valist (first_type,
value_array = gimp_value_array_new_from_types_valist (error_msg,
first_type,
va_args);
va_end (va_args);
@ -180,15 +186,18 @@ gimp_value_array_new_from_types (GType first_type,
* @va_args: a va_list of GTypes and values, terminated by #G_TYPE_NONE
*
* Allocate and initialize a new #GimpValueArray, and fill it with
* values that are initialized to the types passed.
* @va_args given in the order as passed to
* gimp_value_array_new_from_types().
*
* Returns: a newly allocated #GimpValueArray
* Returns: (nullable): a newly allocated #GimpValueArray, or %NULL if
* an error happened.
*
* Since: 3.0
*/
GimpValueArray *
gimp_value_array_new_from_types_valist (GType first_type,
va_list va_args)
gimp_value_array_new_from_types_valist (gchar **error_msg,
GType first_type,
va_list va_args)
{
GimpValueArray *value_array = gimp_value_array_new (0);
GType type;
@ -197,9 +206,32 @@ gimp_value_array_new_from_types_valist (GType first_type,
while (type != G_TYPE_NONE)
{
GValue value = G_VALUE_INIT;
GValue value = G_VALUE_INIT;
gchar *my_error = NULL;
g_value_init (&value, type);
G_VALUE_COLLECT (&value, va_args, G_VALUE_NOCOPY_CONTENTS, &my_error);
if (my_error)
{
if (error_msg)
{
*error_msg = my_error;
}
else
{
g_printerr ("%s: %s", G_STRFUNC, my_error);
g_free (my_error);
}
gimp_value_array_unref (value_array);
va_end (va_args);
return NULL;
}
gimp_value_array_append (value_array, &value);
g_value_unset (&value);

6
libgimpbase/gimpvaluearray.h
View file

@ -42,10 +42,12 @@ GType gimp_value_array_get_type (void) G_GNUC_CONST;
GimpValueArray * gimp_value_array_new (gint n_prealloced);
GimpValueArray * gimp_value_array_new_from_types
(GType first_type,
(gchar **error_msg,
GType first_type,
...);
GimpValueArray * gimp_value_array_new_from_types_valist
(GType first_type,
(gchar **error_msg,
GType first_type,
va_list va_args);
GimpValueArray * gimp_value_array_ref (GimpValueArray *value_array);