diff options
author | Emmanuele Bassi <ebassi@gmail.com> | 2021-11-09 16:28:10 +0000 |
---|---|---|
committer | Emmanuele Bassi <ebassi@gmail.com> | 2021-11-09 16:28:10 +0000 |
commit | 6f351efed8e5f06a0d91ce1df25c242bed397855 (patch) | |
tree | 5a26b15fa70c1947134d738dca596902ba09ce76 | |
parent | c3c79693ec3181b2e5f523d5a006da41b98b8954 (diff) | |
parent | cf3fe453be072e0dad0f7a6f51955bfeefa91446 (diff) | |
download | gdk-pixbuf-6f351efed8e5f06a0d91ce1df25c242bed397855.tar.gz |
Merge branch 'ebassi/for-master' into 'master'
docs: Fix the XPM data annotation
See merge request GNOME/gdk-pixbuf!125
-rw-r--r-- | gdk-pixbuf/gdk-pixbuf-io.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gdk-pixbuf/gdk-pixbuf-io.h b/gdk-pixbuf/gdk-pixbuf-io.h index 6692ad6a9..7565744e5 100644 --- a/gdk-pixbuf/gdk-pixbuf-io.h +++ b/gdk-pixbuf/gdk-pixbuf-io.h @@ -223,18 +223,18 @@ struct _GdkPixbufModulePattern { * * In case of error, this function should return `NULL` and set the `error` argument. * - * Returns: (transfer full): a `GdkPixbuf` with the contents of the file + * Returns: (transfer full): a newly created `GdkPixbuf` for the contents of the file */ typedef GdkPixbuf *(* GdkPixbufModuleLoadFunc) (FILE *f, GError **error); /** * GdkPixbufModuleLoadXpmDataFunc: - * @data: the XPM data, as an array + * @data: (array zero-terminated=1): the XPM data * * Loads XPM data into a new `GdkPixbuf`. * - * Returns: (transfer full): a `GdkPixbuf` with the XPM data + * Returns: (transfer full): a newly created `GdkPixbuf` for the XPM data */ typedef GdkPixbuf *(* GdkPixbufModuleLoadXpmDataFunc) (const char **data); @@ -247,7 +247,7 @@ typedef GdkPixbuf *(* GdkPixbufModuleLoadXpmDataFunc) (const char **data); * * In case of error, this function should return `NULL` and set the `error` argument. * - * Returns: (transfer full): a `GdkPixbufAnimation` with the contents of the file + * Returns: (transfer full): a newly created `GdkPixbufAnimation` for the contents of the file */ typedef GdkPixbufAnimation *(* GdkPixbufModuleLoadAnimationFunc) (FILE *f, GError **error); @@ -270,7 +270,7 @@ typedef GdkPixbufAnimation *(* GdkPixbufModuleLoadAnimationFunc) (FILE *f, * [callback@GdkPixbuf.PixbufModuleIncrementLoadFunc] callback, and will be freed * by [callback@GdkPixbuf.PixbufModuleStopLoadFunc] callback. * - * Returns: (transfer full) (nullable): the data to be passed to + * Returns: (transfer full): the data to be passed to * [callback@GdkPixbuf.PixbufModuleIncrementLoadFunc] * and [callback@GdkPixbuf.PixbufModuleStopLoadFunc], or `NULL` in case of error */ |